Author: tabish
Date: Tue Sep 14 15:30:16 2010
New Revision: 996950

URL: http://svn.apache.org/viewvc?rev=996950&view=rev
Log:
fix for: https://issues.apache.org/activemq/browse/AMQCPP-317

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

Modified: activemq/activemq-cpp/branches/activemq-cpp-3.2.x/activemq-cpp/src/main/activemq/wireformat/stomp/StompHelper.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/branches/activemq-cpp-3.2.x/activemq-cpp/src/main/activemq/wireformat/stomp/StompHelper.cpp?rev=996950&r1=996949&r2=996950&view=diff
==============================================================================
--- activemq/activemq-cpp/branches/activemq-cpp-3.2.x/activemq-cpp/src/main/activemq/wireformat/stomp/StompHelper.cpp (original)
+++ activemq/activemq-cpp/branches/activemq-cpp-3.2.x/activemq-cpp/src/main/activemq/wireformat/stomp/StompHelper.cpp Tue Sep 14 15:30:16 2010
@@ -265,9 +265,18 @@ Pointer<ConsumerId> StompHelper::convert
     }
 
     Pointer<ConsumerId> id( new ConsumerId() );
+
     StringTokenizer tokenizer( consumerId, ":" );
 
-    id->setConnectionId( tokenizer.nextToken() );
+    string connectionId;
+
+    connectionId += tokenizer.nextToken();
+    connectionId += ":";
+    connectionId += tokenizer.nextToken();
+    connectionId += ":";
+    connectionId += tokenizer.nextToken();
+
+    id->setConnectionId( connectionId );
 
     while( tokenizer.hasMoreTokens() ){
         string text = tokenizer.nextToken();
@@ -322,8 +331,13 @@ Pointer<TransactionId> StompHelper::conv
     Pointer<LocalTransactionId> id( new LocalTransactionId() );
     StringTokenizer tokenizer( transactionId, ":" );
 
+    string connectionIdStr;
+    connectionIdStr += tokenizer.nextToken();
+    connectionIdStr += ":";
+    connectionIdStr += tokenizer.nextToken();
+
     Pointer<ConnectionId> connectionId( new ConnectionId() );
-    connectionId->setValue( tokenizer.nextToken() );
+    connectionId->setValue( connectionIdStr );
     id->setConnectionId( connectionId );
 
     while( tokenizer.hasMoreTokens() ){