Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 26339 invoked from network); 29 Mar 2011 10:33:43 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 29 Mar 2011 10:33:43 -0000 Received: (qmail 60641 invoked by uid 500); 29 Mar 2011 10:33:43 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 60595 invoked by uid 500); 29 Mar 2011 10:33:42 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 60588 invoked by uid 99); 29 Mar 2011 10:33:42 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 29 Mar 2011 10:33:42 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 29 Mar 2011 10:33:41 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 9786A23889E3; Tue, 29 Mar 2011 10:33:21 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1086542 - in /activemq/trunk/activemq-core/src: main/java/org/apache/activemq/openwire/ test/java/org/apache/activemq/openwire/ Date: Tue, 29 Mar 2011 10:33:21 -0000 To: commits@activemq.apache.org From: gtully@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110329103321.9786A23889E3@eris.apache.org> 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; }