svn commit: r640684 - /activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/WireFormatNegotiator.java

[chirino]

Author: chirino
Date: Mon Mar 24 20:36:07 2008
New Revision: 640684

URL: http://svn.apache.org/viewvc?rev=640684&view=rev
Log:
It's possible the prefered wireformat could be null

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

Modified: 
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/WireFormatNegotiator.java
URL: 
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/WireFormatNegotiator.java?rev=640684&r1=640683&r2=640684&view=diff
==============================================================================
--- 
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/WireFormatNegotiator.java
 (original)
+++ 
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/WireFormatNegotiator.java
 Mon Mar 24 20:36:07 2008
@@ -61,7 +61,9 @@
         // Setup the initial negociation timeout to be the same as the inital 
max inactivity delay specified on the wireformat
         // Does not make sense for us to take longer.
         try {
-            
setNegotiateTimeout(wireFormat.getPreferedWireFormatInfo().getMaxInactivityDurationInitalDelay());
+            if( wireFormat.getPreferedWireFormatInfo() !=null ) {
+                
setNegotiateTimeout(wireFormat.getPreferedWireFormatInfo().getMaxInactivityDurationInitalDelay());
+            }
         } catch (IOException e) {
         }
     }