QPID-6400 : Merge of r1661142 to 0.32 branch

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.32@1661729 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 10 insertions, 0 deletions

diff --git a/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ConnectionFactoryImpl.java b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ConnectionFactoryImpl.java
index 3bf9efd3d9..e92cd15ce5 100644
--- a/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ConnectionFactoryImpl.java
+++ b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ConnectionFactoryImpl.java
@@ -771,6 +771,16 @@ public class ConnectionFactoryImpl implements ConnectionFactory, TopicConnection
         return _sslEnabledProtocols;
     }
 
+    public SSLContext getSslContext()
+    {
+        return _sslContext;
+    }
+
+    public void setSslContext(final SSLContext sslContext)
+    {
+        _sslContext = sslContext;
+    }
+
     public void setSslEnabledProtocols(final String sslEnabledProtocols)
     {
         _sslEnabledProtocols = sslEnabledProtocols;