Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 96490 invoked from network); 21 Feb 2007 17:10:44 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 21 Feb 2007 17:10:44 -0000 Received: (qmail 11422 invoked by uid 500); 21 Feb 2007 17:10:53 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 11368 invoked by uid 500); 21 Feb 2007 17:10:52 -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 11356 invoked by uid 99); 21 Feb 2007 17:10:52 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 21 Feb 2007 09:10:52 -0800 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 21 Feb 2007 09:10:44 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id CCDBD1A981D; Wed, 21 Feb 2007 09:10:23 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r510103 - in /activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire: OpenWireConnector.cpp marshal/PrimitiveMapMarshaller.cpp Date: Wed, 21 Feb 2007 17:10:23 -0000 To: commits@activemq.apache.org From: tabish@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070221171023.CCDBD1A981D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tabish Date: Wed Feb 21 09:10:23 2007 New Revision: 510103 URL: http://svn.apache.org/viewvc?view=rev&rev=510103 Log: http://issues.apache.org/activemq/browse/AMQCPP-30 Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/OpenWireConnector.cpp activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/PrimitiveMapMarshaller.cpp Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/OpenWireConnector.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/OpenWireConnector.cpp?view=diff&rev=510103&r1=510102&r2=510103 ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/OpenWireConnector.cpp (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/OpenWireConnector.cpp Wed Feb 21 09:10:23 2007 @@ -1214,7 +1214,13 @@ messageListener->onConsumerMessage( info, message, - false ); + true ); + + // Clear the Message as we've passed it onto the + // listener, who is responsible for deleting it at + // the appropriate time, which depends on things like + // the session being transacted etc. + dispatch->setMessage( NULL ); } }catch( ... ){/* do nothing*/} Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/PrimitiveMapMarshaller.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/PrimitiveMapMarshaller.cpp?view=diff&rev=510103&r1=510102&r2=510103 ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/PrimitiveMapMarshaller.cpp (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/PrimitiveMapMarshaller.cpp Wed Feb 21 09:10:23 2007 @@ -104,7 +104,7 @@ try { - if( map == NULL ) { + if( map == NULL || src.empty() ) { return; }