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 2012/10/05 15:02:06 UTC

svn commit: r1394494 - /activemq/activemq-cpp/branches/activemq-cpp-3.4.x/activemq-cpp/src/main/activemq/wireformat/stomp/StompHelper.cpp

Author: tabish
Date: Fri Oct  5 13:02:05 2012
New Revision: 1394494

URL: http://svn.apache.org/viewvc?rev=1394494&view=rev
Log:
fix for: https://issues.apache.org/jira/browse/AMQCPP-433

Modified:
    activemq/activemq-cpp/branches/activemq-cpp-3.4.x/activemq-cpp/src/main/activemq/wireformat/stomp/StompHelper.cpp

Modified: activemq/activemq-cpp/branches/activemq-cpp-3.4.x/activemq-cpp/src/main/activemq/wireformat/stomp/StompHelper.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/branches/activemq-cpp-3.4.x/activemq-cpp/src/main/activemq/wireformat/stomp/StompHelper.cpp?rev=1394494&r1=1394493&r2=1394494&view=diff
==============================================================================
--- activemq/activemq-cpp/branches/activemq-cpp-3.4.x/activemq-cpp/src/main/activemq/wireformat/stomp/StompHelper.cpp (original)
+++ activemq/activemq-cpp/branches/activemq-cpp-3.4.x/activemq-cpp/src/main/activemq/wireformat/stomp/StompHelper.cpp Fri Oct  5 13:02:05 2012
@@ -55,7 +55,10 @@ void StompHelper::convertProperties( con
     message->setMessageId( convertMessageId( messageId ) );
 
     // the standard JMS headers
-    message->setCorrelationId( StompCommandConstants::HEADER_CORRELATIONID );
+    if( frame->hasProperty( StompCommandConstants::HEADER_CORRELATIONID ) ) {
+        message->setCorrelationId(
+            frame->removeProperty( StompCommandConstants::HEADER_CORRELATIONID ) );
+    }
 
     if( frame->hasProperty( StompCommandConstants::HEADER_EXPIRES ) ) {
         message->setExpiration( Long::parseLong(