Merge branch '6.1.x'

avast · Nov 12, 2018 · 0f5cabd · 0f5cabd
2 parents f9de151 + e32b728
commit 0f5cabd
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/core/src/main/scala/com/avast/clients/rabbitmq/RabbitMQConnection.scala b/core/src/main/scala/com/avast/clients/rabbitmq/RabbitMQConnection.scala
@@ -11,6 +11,7 @@ import com.avast.metrics.scalaapi.Monitor
 import com.rabbitmq.client._
 import com.typesafe.config.{Config, ConfigFactory}
 import com.typesafe.scalalogging.StrictLogging
+import javax.net.ssl.SSLContext
 import monix.execution.Scheduler
 import net.ceedubs.ficus.Ficus._
 import net.ceedubs.ficus.readers.ArbitraryTypeReader._
@@ -232,7 +233,7 @@ object RabbitMQConnection extends StrictLogging {
 
         factory.useSslProtocol(sslContext)
       } else {
-        factory.useSslProtocol()
+        factory.useSslProtocol(SSLContext.getDefault)
       }
     }