Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

https://issues.apache.org/jira/browse/AMQ-3236 - fix regression in MessageAckTest, ensure wireversion is used for marshaller test 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1086542 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Gary Tully 2011-03-29 10:33:21 +00:00
parent 70daf6ef74
commit eb22a02563
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java
View File

@ -39,6 +39,7 @@ import org.apache.activemq.wireformat.WireFormat;
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;

3
activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormatFactory.java
View File

@ -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 implements WireFormatFactory {
// 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;

2
activemq-core/src/test/java/org/apache/activemq/openwire/DataFileGeneratorTestSupport.java
View File

@ -263,7 +263,7 @@ public abstract class DataFileGeneratorTestSupport extends TestSupport {
OpenWireFormat wf = new OpenWireFormat();
wf.setCacheEnabled(true);
wf.setStackTraceEnabled(false);
wf.setVersion(OpenWireFormat.DEFAULT_VERSION);
wf.setVersion(OpenWireFormat.DEFAULT_WIRE_VERSION);
return wf;
}