merge bug19356 into default

Matthias Radestock · Matthias Radestock · commit 030511b7a45c · 2009-08-29T05:27:52.000+01:00
diff --git a/src/com/rabbitmq/client/ConnectionFactory.java b/src/com/rabbitmq/client/ConnectionFactory.java
@@ -128,7 +128,7 @@ public void useSslProtocol(String protocol, TrustManager trustManager)
     {
         SSLContext c = SSLContext.getInstance(protocol);
         c.init(null, new TrustManager[] { trustManager }, null);
-        setSocketFactory(c.getSocketFactory());
+        useSslProtocol(c);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ public void useSslProtocol(String protocol, TrustManager trustManager)`
`128`	`128`	`{`
`129`	`129`	`SSLContext c = SSLContext.getInstance(protocol);`
`130`	`130`	`c.init(null, new TrustManager[] { trustManager }, null);`
`131`		`- setSocketFactory(c.getSocketFactory());`
	`131`	`+ useSslProtocol(c);`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`/**`