Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 51197 invoked from network); 24 Oct 2007 18:46:30 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 24 Oct 2007 18:46:30 -0000 Received: (qmail 79743 invoked by uid 500); 24 Oct 2007 18:46:17 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 79722 invoked by uid 500); 24 Oct 2007 18:46:17 -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 79713 invoked by uid 99); 24 Oct 2007 18:46:17 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 Oct 2007 11:46:17 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED 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, 24 Oct 2007 18:46:29 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7DFF61A9832; Wed, 24 Oct 2007 11:45:39 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r587962 - /activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/PrimitiveMapMarshaller.cpp Date: Wed, 24 Oct 2007 18:45:39 -0000 To: commits@activemq.apache.org From: tabish@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071024184539.7DFF61A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tabish Date: Wed Oct 24 11:45:38 2007 New Revision: 587962 URL: http://svn.apache.org/viewvc?rev=587962&view=rev Log: https://issues.apache.org/activemq/browse/AMQCPP-149 Fixed null entry in primitive map in incoming messages from crashing the client. Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/PrimitiveMapMarshaller.cpp Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/PrimitiveMapMarshaller.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/PrimitiveMapMarshaller.cpp?rev=587962&r1=587961&r2=587962&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/PrimitiveMapMarshaller.cpp (original) +++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/PrimitiveMapMarshaller.cpp Wed Oct 24 11:45:38 2007 @@ -217,6 +217,9 @@ switch( type ) { + case PrimitiveMap::NULL_TYPE: + map.setString( key, "" ); + break; case PrimitiveMap::BYTE_TYPE: map.setByte( key, dataIn.readByte() ); break;