Return-Path: Delivered-To: apmail-geronimo-activemq-commits-archive@www.apache.org Received: (qmail 3699 invoked from network); 31 Mar 2006 09:32:24 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 31 Mar 2006 09:32:23 -0000 Received: (qmail 61150 invoked by uid 500); 31 Mar 2006 09:32:22 -0000 Delivered-To: apmail-geronimo-activemq-commits-archive@geronimo.apache.org Received: (qmail 61127 invoked by uid 500); 31 Mar 2006 09:32:22 -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 61114 invoked by uid 99); 31 Mar 2006 09:32:22 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 31 Mar 2006 01:32:22 -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; Fri, 31 Mar 2006 01:32:21 -0800 Received: (qmail 3420 invoked by uid 65534); 31 Mar 2006 09:31:59 -0000 Message-ID: <20060331093159.3417.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r390379 - /incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQInputStream.java Date: Fri, 31 Mar 2006 09:31:59 -0000 To: activemq-commits@geronimo.apache.org From: jstrachan@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: jstrachan Date: Fri Mar 31 01:31:57 2006 New Revision: 390379 URL: http://svn.apache.org/viewcvs?rev=390379&view=rev Log: added better exception message Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQInputStream.java Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQInputStream.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQInputStream.java?rev=390379&r1=390378&r2=390379&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQInputStream.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQInputStream.java Fri Mar 31 01:31:57 2006 @@ -197,9 +197,10 @@ ActiveMQMessage m = receive(); if( m!=null && m.getDataStructureType() == CommandTypes.ACTIVEMQ_BYTES_MESSAGE ) { // First message. + long producerSequenceId = m.getMessageId().getProducerSequenceId(); if( producerId == null ) { // We have to start a stream at sequence id = 0 - if( m.getMessageId().getProducerSequenceId()!=0 ) { + if( producerSequenceId!=0 ) { continue; } nextSequenceId++; @@ -209,8 +210,8 @@ if( !m.getMessageId().getProducerId().equals(producerId) ) { throw new IOException("Received an unexpected message: invalid producer: "+m); } - if( m.getMessageId().getProducerSequenceId()!=nextSequenceId++ ) { - throw new IOException("Received an unexpected message: invalid sequence id: "+m); + if( producerSequenceId!=nextSequenceId++ ) { + throw new IOException("Received an unexpected message: expected ID: " + (nextSequenceId - 1) + " but was: " + producerSequenceId + " for message: "+m); } }