activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r1311414 - in /activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/transport: SslTransportFactory.java TcpTransportFactory.java TransportFactorySupport.java UdpTransportFactory.java
Date Mon, 09 Apr 2012 20:20:31 GMT
Author: chirino
Date: Mon Apr  9 20:20:31 2012
New Revision: 1311414

URL: http://svn.apache.org/viewvc?rev=1311414&view=rev
Log:
Fixes APLO-186: Using ?client_auth=need Still Allows SSL Connections with no Client Cert

Modified:
    activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/transport/SslTransportFactory.java
    activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/transport/TcpTransportFactory.java
    activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/transport/TransportFactorySupport.java
    activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/transport/UdpTransportFactory.java

Modified: activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/transport/SslTransportFactory.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/transport/SslTransportFactory.java?rev=1311414&r1=1311413&r2=1311414&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/transport/SslTransportFactory.java
(original)
+++ activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/transport/SslTransportFactory.java
Mon Apr  9 20:20:31 2012
@@ -24,6 +24,7 @@ import org.fusesource.hawtdispatch.trans
 
 import javax.net.ssl.SSLContext;
 import java.net.URI;
+import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -44,7 +45,7 @@ public class SslTransportFactory extends
                 @Override
                 protected TcpTransport createTransport() {
                     TcpTransport transport = super.createTransport();
-                    IntrospectionSupport.setProperties(transport, options);
+                    IntrospectionSupport.setProperties(transport, new HashMap(options));
                     return transport;
                 }
             }.protocol(protocol);

Modified: activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/transport/TcpTransportFactory.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/transport/TcpTransportFactory.java?rev=1311414&r1=1311413&r2=1311414&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/transport/TcpTransportFactory.java
(original)
+++ activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/transport/TcpTransportFactory.java
Mon Apr  9 20:20:31 2012
@@ -52,7 +52,7 @@ public class TcpTransportFactory impleme
         if (server == null) return null;
 
         Map<String, String> copy = new HashMap<String, String>(options);
-        IntrospectionSupport.setProperties(server, options);
+        IntrospectionSupport.setProperties(server, new HashMap(options));
         return server;
     }
 
@@ -85,7 +85,7 @@ public class TcpTransportFactory impleme
             @Override
             protected TcpTransport createTransport() {
                 TcpTransport transport = super.createTransport();
-                IntrospectionSupport.setProperties(transport, options);
+                IntrospectionSupport.setProperties(transport, new HashMap(options));
                 return transport;
             }
         };

Modified: activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/transport/TransportFactorySupport.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/transport/TransportFactorySupport.java?rev=1311414&r1=1311413&r2=1311414&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/transport/TransportFactorySupport.java
(original)
+++ activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/transport/TransportFactorySupport.java
Mon Apr  9 20:20:31 2012
@@ -20,6 +20,7 @@ import org.fusesource.hawtdispatch.trans
 import org.apache.activemq.apollo.util.IntrospectionSupport;
 
 import java.io.IOException;
+import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -28,7 +29,7 @@ import java.util.Map;
 public class  TransportFactorySupport {
 
     static public Transport configure(Transport transport, Map<String, String> options)
throws IOException {
-        IntrospectionSupport.setProperties(transport, options);
+        IntrospectionSupport.setProperties(transport, new HashMap(options));
         return transport;
     }
 

Modified: activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/transport/UdpTransportFactory.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/transport/UdpTransportFactory.java?rev=1311414&r1=1311413&r2=1311414&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/transport/UdpTransportFactory.java
(original)
+++ activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/transport/UdpTransportFactory.java
Mon Apr  9 20:20:31 2012
@@ -46,7 +46,7 @@ public class UdpTransportFactory impleme
         if (server == null) return null;
 
         Map<String, String> copy = new HashMap<String, String>(options);
-        IntrospectionSupport.setProperties(server, options);
+        IntrospectionSupport.setProperties(server, new HashMap(options));
         return server;
     }
 
@@ -63,7 +63,7 @@ public class UdpTransportFactory impleme
             @Override
             protected UdpTransport createTransport() {
                 UdpTransport transport = super.createTransport();
-                IntrospectionSupport.setProperties(transport, options);
+                IntrospectionSupport.setProperties(transport, new HashMap(options));
                 return transport;
             }
         };



Mime
View raw message