You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2010/06/30 15:31:58 UTC
svn commit: r959303 - in
/activemq/activemq-cpp/branches/activemq-cpp-3.2.x/activemq-cpp/src:
main/activemq/wireformat/openwire/marshal/PrimitiveTypesMarshaller.cpp
test/activemq/commands/ActiveMQMapMessageTest.cpp
Author: tabish
Date: Wed Jun 30 13:31:58 2010
New Revision: 959303
URL: http://svn.apache.org/viewvc?rev=959303&view=rev
Log:
fix for: https://issues.apache.org/activemq/browse/AMQCPP-301
Modified:
activemq/activemq-cpp/branches/activemq-cpp-3.2.x/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/PrimitiveTypesMarshaller.cpp
activemq/activemq-cpp/branches/activemq-cpp-3.2.x/activemq-cpp/src/test/activemq/commands/ActiveMQMapMessageTest.cpp (contents, props changed)
Modified: activemq/activemq-cpp/branches/activemq-cpp-3.2.x/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/PrimitiveTypesMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/branches/activemq-cpp-3.2.x/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/PrimitiveTypesMarshaller.cpp?rev=959303&r1=959302&r2=959303&view=diff
==============================================================================
--- activemq/activemq-cpp/branches/activemq-cpp-3.2.x/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/PrimitiveTypesMarshaller.cpp (original)
+++ activemq/activemq-cpp/branches/activemq-cpp-3.2.x/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/PrimitiveTypesMarshaller.cpp Wed Jun 30 13:31:58 2010
@@ -411,8 +411,10 @@ PrimitiveValueNode PrimitiveTypesMarshal
{
int size = dataIn.readInt();
std::vector<unsigned char> data;
- data.resize( size );
- dataIn.readFully( &data[0], size );
+ if( size > 0 ) {
+ data.resize( size );
+ dataIn.readFully( &data[0], size );
+ }
value.setByteArray( data );
break;
}
Modified: activemq/activemq-cpp/branches/activemq-cpp-3.2.x/activemq-cpp/src/test/activemq/commands/ActiveMQMapMessageTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/branches/activemq-cpp-3.2.x/activemq-cpp/src/test/activemq/commands/ActiveMQMapMessageTest.cpp?rev=959303&r1=959302&r2=959303&view=diff
==============================================================================
--- activemq/activemq-cpp/branches/activemq-cpp-3.2.x/activemq-cpp/src/test/activemq/commands/ActiveMQMapMessageTest.cpp (original)
+++ activemq/activemq-cpp/branches/activemq-cpp-3.2.x/activemq-cpp/src/test/activemq/commands/ActiveMQMapMessageTest.cpp Wed Jun 30 13:31:58 2010
@@ -277,6 +277,10 @@ void ActiveMQMapMessageTest::testGetByte
ex.printStackTrace();
CPPUNIT_ASSERT( false );
}
+
+ ActiveMQMapMessage msg3;
+ msg3.setBytes( "empty", std::vector<unsigned char>() );
+ CPPUNIT_ASSERT_NO_THROW( msg3.getBytes( "empty" ) );
}
////////////////////////////////////////////////////////////////////////////////
Propchange: activemq/activemq-cpp/branches/activemq-cpp-3.2.x/activemq-cpp/src/test/activemq/commands/ActiveMQMapMessageTest.cpp
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun 30 13:31:58 2010
@@ -0,0 +1 @@
+/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/commands/ActiveMQMapMessageTest.cpp:959300