From 861a08912b7ee525496978c0119cd0f84bc7bed6 Mon Sep 17 00:00:00 2001 From: "Hiram R. Chirino" Date: Wed, 6 Sep 2006 00:40:48 +0000 Subject: [PATCH] http://issues.apache.org/activemq/browse/AMQ-913 git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/branches/activemq-4.0@440543 13f79535-47bb-0310-9956-ffa450edef68 --- .../main/java/org/apache/activemq/openwire/OpenWireFormat.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java b/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java index eb751d9af3..8e97f75d49 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java @@ -567,7 +567,7 @@ final public class OpenWireFormat implements WireFormat { 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();