qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rgodf...@apache.org
Subject svn commit: r1661729 - in /qpid/branches/0.32/qpid: ./ java/ java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ConnectionFactoryImpl.java
Date Mon, 23 Feb 2015 18:02:08 GMT
Author: rgodfrey
Date: Mon Feb 23 18:02:08 2015
New Revision: 1661729

URL: http://svn.apache.org/r1661729
Log:
QPID-6400 : Merge of r1661142 to 0.32 branch

Modified:
    qpid/branches/0.32/qpid/   (props changed)
    qpid/branches/0.32/qpid/java/   (props changed)
    qpid/branches/0.32/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ConnectionFactoryImpl.java

Propchange: qpid/branches/0.32/qpid/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 23 18:02:08 2015
@@ -6,3 +6,4 @@
 /qpid/branches/mcpierce-QPID-4719/qpid:1477004-1477093
 /qpid/branches/qpid-2935/qpid:1061302-1072333
 /qpid/branches/qpid-3346/qpid:1144319-1179855
+/qpid/trunk/qpid:1661142

Propchange: qpid/branches/0.32/qpid/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 23 18:02:08 2015
@@ -9,3 +9,4 @@
 /qpid/branches/java-network-refactor/qpid/java:805429-821809
 /qpid/branches/qpid-2935/qpid/java:1061302-1072333
 /qpid/trunk/qpid:796646-796653
+/qpid/trunk/qpid/java:1661142

Modified: qpid/branches/0.32/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ConnectionFactoryImpl.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.32/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ConnectionFactoryImpl.java?rev=1661729&r1=1661728&r2=1661729&view=diff
==============================================================================
--- qpid/branches/0.32/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ConnectionFactoryImpl.java
(original)
+++ qpid/branches/0.32/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ConnectionFactoryImpl.java
Mon Feb 23 18:02:08 2015
@@ -771,6 +771,16 @@ public class ConnectionFactoryImpl imple
         return _sslEnabledProtocols;
     }
 
+    public SSLContext getSslContext()
+    {
+        return _sslContext;
+    }
+
+    public void setSslContext(final SSLContext sslContext)
+    {
+        _sslContext = sslContext;
+    }
+
     public void setSslEnabledProtocols(final String sslEnabledProtocols)
     {
         _sslEnabledProtocols = sslEnabledProtocols;



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message