activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
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 GMT
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;
         }
 



Mime
View raw message