activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r440543 - /incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java
Date Wed, 06 Sep 2006 00:40:48 GMT
Author: chirino
Date: Tue Sep  5 17:40:48 2006
New Revision: 440543

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

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

Modified: incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java?view=diff&rev=440543&r1=440542&r2=440543
==============================================================================
--- incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java
(original)
+++ incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java
Tue Sep  5 17:40:48 2006
@@ -567,7 +567,7 @@
 		if( preferedWireFormatInfo==null )
 			throw new IllegalStateException("Wireformat cannot not be renegociated.");
 		
-		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();



Mime
View raw message