activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gtu...@apache.org
Subject svn commit: r702447 - /activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransportServer.java
Date Tue, 07 Oct 2008 12:01:04 GMT
Author: gtully
Date: Tue Oct  7 05:01:03 2008
New Revision: 702447

URL: http://svn.apache.org/viewvc?rev=702447&view=rev
Log:
AMQ-1967 - fix: SslTransportServerTest, check for null transportOptions

Modified:
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransportServer.java

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransportServer.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransportServer.java?rev=702447&r1=702446&r2=702447&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransportServer.java
(original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransportServer.java
Tue Oct  7 05:01:03 2008
@@ -158,7 +158,9 @@
 
     private void configureServerSocket(ServerSocket socket) throws SocketException {
         socket.setSoTimeout(2000);
-        IntrospectionSupport.setProperties(socket, transportOptions);
+        if (transportOptions != null) {
+            IntrospectionSupport.setProperties(socket, transportOptions);
+        }
     }
 
     /**



Mime
View raw message