svn commit: r1086542 - in /activemq/trunk/activemq-core/src: main/java/org/apache/activemq/openwire/ test/java/org/apache/activemq/openwire/

[gtully]

Author: gtully
Date: Tue Mar 29 10:33:21 2011
New Revision: 1086542

URL: http://svn.apache.org/viewvc?rev=1086542&view=rev
Log:
https://issues.apache.org/jira/browse/AMQ-3236 - fix regression in 
MessageAckTest, ensure wireversion is used for marshaller test

Modified:
    
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java
    
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormatFactory.java
    
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/DataFileGeneratorTestSupport.java

Modified: 
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java
URL: 
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java?rev=1086542&r1=1086541&r2=1086542&view=diff
==============================================================================
--- 
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java
 (original)
+++ 
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java
 Tue Mar 29 10:33:21 2011
@@ -39,6 +39,7 @@ import org.apache.activemq.wireformat.Wi
 public final class OpenWireFormat implements WireFormat {
 
     public static final int DEFAULT_VERSION = 
CommandTypes.PROTOCOL_STORE_VERSION;
+    public static final int DEFAULT_WIRE_VERSION = 
CommandTypes.PROTOCOL_VERSION;
 
     static final byte NULL_TYPE = CommandTypes.NULL;
     private static final int MARSHAL_CACHE_SIZE = Short.MAX_VALUE / 2;

Modified: 
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormatFactory.java
URL: 
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormatFactory.java?rev=1086542&r1=1086541&r2=1086542&view=diff
==============================================================================
--- 
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormatFactory.java
 (original)
+++ 
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormatFactory.java
 Tue Mar 29 10:33:21 2011
@@ -16,7 +16,6 @@
  */
 package org.apache.activemq.openwire;
 
-import org.apache.activemq.command.CommandTypes;
 import org.apache.activemq.command.WireFormatInfo;
 import org.apache.activemq.wireformat.WireFormat;
 import org.apache.activemq.wireformat.WireFormatFactory;
@@ -31,7 +30,7 @@ public class OpenWireFormatFactory imple
     // default negotiation.
     //
 
-    private int version = CommandTypes.PROTOCOL_VERSION;
+    private int version = OpenWireFormat.DEFAULT_WIRE_VERSION;
     private boolean stackTraceEnabled = true;
     private boolean tcpNoDelayEnabled = true;
     private boolean cacheEnabled = true;

Modified: 
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/DataFileGeneratorTestSupport.java
URL: 
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/DataFileGeneratorTestSupport.java?rev=1086542&r1=1086541&r2=1086542&view=diff
==============================================================================
--- 
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/DataFileGeneratorTestSupport.java
 (original)
+++ 
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/DataFileGeneratorTestSupport.java
 Tue Mar 29 10:33:21 2011
@@ -263,7 +263,7 @@ public abstract class DataFileGeneratorT
         OpenWireFormat wf = new OpenWireFormat();
         wf.setCacheEnabled(true);
         wf.setStackTraceEnabled(false);
-        wf.setVersion(OpenWireFormat.DEFAULT_VERSION);
+        wf.setVersion(OpenWireFormat.DEFAULT_WIRE_VERSION);
         return wf;
     }