You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2006/09/06 02:39:55 UTC

svn commit: r440541 - /incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java

Author: chirino
Date: Tue Sep  5 17:39:54 2006
New Revision: 440541

URL: http://svn.apache.org/viewvc?view=rev&rev=440541
Log:
http://issues.apache.org/activemq/browse/AMQ-913

Modified:
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java?view=diff&rev=440541&r1=440540&r2=440541
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java Tue Sep  5 17:39:54 2006
@@ -565,7 +565,7 @@
 		if( preferedWireFormatInfo==null )
 			throw new IllegalStateException("Wireformat cannot not be renegotiated.");
 		
-		this.setVersion(Math.max(preferedWireFormatInfo.getVersion(), info.getVersion()) );
+		this.setVersion(Math.min(preferedWireFormatInfo.getVersion(), info.getVersion()) );
 		this.stackTraceEnabled = info.isStackTraceEnabled() && preferedWireFormatInfo.isStackTraceEnabled();
 		this.tcpNoDelayEnabled = info.isTcpNoDelayEnabled() && preferedWireFormatInfo.isTcpNoDelayEnabled();
 		this.cacheEnabled = info.isCacheEnabled() && preferedWireFormatInfo.isCacheEnabled();