Skip to content

Commit 3a7f825

Browse files
US887031: Set fixed version of TLS (#182)
1 parent 1210696 commit 3a7f825

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

util-rabbitmq/src/main/java/com/hpe/caf/util/rabbitmq/RabbitUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ public static Connection createRabbitConnection(final RabbitConfiguration rc,
115115
final TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(tmfAlgorithm);
116116
trustManagerFactory.init((KeyStore) null);
117117

118-
final SSLContext context = SSLContext.getInstance("TLS");
118+
final SSLContext context = SSLContext.getInstance("TLSv1.2");
119119
context.init(null, trustManagerFactory.getTrustManagers(), null);
120120

121121
factory.useSslProtocol(context);

worker-queue-rabbit/src/main/java/com/hpe/caf/worker/queue/rabbit/RabbitWorkerQueue.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ public WorkerQueueMetricsReporter getMetrics()
308308
@Override
309309
public HealthResult healthCheck()
310310
{
311-
if (!conn.isOpen()) {
311+
if (conn == null || !conn.isOpen()) {
312312
return new HealthResult(HealthStatus.UNHEALTHY, "Rabbit connection failed");
313313
} else if (!incomingChannel.isOpen()) {
314314
return new HealthResult(HealthStatus.UNHEALTHY, "Incoming channel failed");

0 commit comments

Comments
 (0)