From activemq-commits-return-982-apmail-geronimo-activemq-commits-archive=geronimo.apache.org@geronimo.apache.org Mon Mar 06 14:11:08 2006 Return-Path: Delivered-To: apmail-geronimo-activemq-commits-archive@www.apache.org Received: (qmail 18435 invoked from network); 6 Mar 2006 14:11:08 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 6 Mar 2006 14:11:08 -0000 Received: (qmail 78954 invoked by uid 500); 6 Mar 2006 14:11:54 -0000 Delivered-To: apmail-geronimo-activemq-commits-archive@geronimo.apache.org Received: (qmail 78913 invoked by uid 500); 6 Mar 2006 14:11:54 -0000 Mailing-List: contact activemq-commits-help@geronimo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: activemq-dev@geronimo.apache.org Delivered-To: mailing list activemq-commits@geronimo.apache.org Received: (qmail 78904 invoked by uid 99); 6 Mar 2006 14:11:54 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Mar 2006 06:11:54 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Mon, 06 Mar 2006 06:11:53 -0800 Received: (qmail 18283 invoked by uid 65534); 6 Mar 2006 14:10:46 -0000 Message-ID: <20060306141046.18282.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r383545 - /incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java Date: Mon, 06 Mar 2006 14:10:45 -0000 To: activemq-commits@geronimo.apache.org From: chirino@apache.org X-Mailer: svnmailer-1.0.7 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: chirino Date: Mon Mar 6 06:10:43 2006 New Revision: 383545 URL: http://svn.apache.org/viewcvs?rev=383545&view=rev Log: updated hashCode and equals to pickup new fields. Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java?rev=383545&r1=383544&r2=383545&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java Mon Mar 6 06:10:43 2006 @@ -72,7 +72,9 @@ return version ^ (cacheEnabled ? 0x10000000:0x20000000) ^ (stackTraceEnabled ? 0x01000000:0x02000000) - ^ (tightEncodingEnabled ? 0x00100000:0x00200000); + ^ (tightEncodingEnabled ? 0x00100000:0x00200000) + ^ (prefixPacketSize ? 0x00010000:0x00020000) + ; } public boolean equals(Object object) { @@ -82,11 +84,13 @@ return o.stackTraceEnabled == stackTraceEnabled && o.cacheEnabled == cacheEnabled && o.version == version && - o.tightEncodingEnabled == tightEncodingEnabled; + o.tightEncodingEnabled == tightEncodingEnabled && + o.prefixPacketSize == prefixPacketSize + ; } public String toString() { - return "OpenWireFormat{version="+version+", cacheEnabled="+cacheEnabled+", stackTraceEnabled="+stackTraceEnabled+"}"; + return "OpenWireFormat{version="+version+", cacheEnabled="+cacheEnabled+", stackTraceEnabled="+stackTraceEnabled+", tightEncodingEnabled="+tightEncodingEnabled+", prefixPacketSize="+prefixPacketSize+"}"; } public int getVersion() {