activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r507756 - in /activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq: connector/openwire/marshal/v2/ network/
Date Thu, 15 Feb 2007 00:39:18 GMT
Author: tabish
Date: Wed Feb 14 16:39:17 2007
New Revision: 507756

URL: http://svn.apache.org/viewvc?view=rev&rev=507756
Log:
http://issues.apache.org/activemq/browse/AMQCPP-30

Regen commands and marshallers to use updated scripts so that marshalling code is now more
correct.

Modified:
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/BaseCommandMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/BrokerInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConnectionControlMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConnectionInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConsumerControlMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConsumerInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/IntegerResponseMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/JournalTransactionMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/MessageAckMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/MessageDispatchMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/MessageMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/NetworkBridgeFilterMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/PartialCommandMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ProducerInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ReplayCommandMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ResponseMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/WireFormatInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/XATransactionIdMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/network/SocketInputStream.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/network/SocketOutputStream.cpp

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/BaseCommandMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/BaseCommandMarshaller.cpp?view=diff&rev=507756&r1=507755&r2=507756
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/BaseCommandMarshaller.cpp
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/BaseCommandMarshaller.cpp
Wed Feb 14 16:39:17 2007
@@ -65,7 +65,7 @@
 
     transport::Command* info =
         dynamic_cast<transport::Command*>( dataStructure );
-    dataOut->write( info->getCommandId() );
+    dataOut->writeInt( info->getCommandId() );
     bs->readBoolean();
 }
 
@@ -86,7 +86,7 @@
         dynamic_cast<transport::Command*>( dataStructure );
     BaseDataStreamMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
 
-    dataOut->write( info->getCommandId() );
-    dataOut->write( info->isResponseRequired() );
+    dataOut->writeInt( info->getCommandId() );
+    dataOut->writeBoolean( info->isResponseRequired() );
 }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/BrokerInfoMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/BrokerInfoMarshaller.cpp?view=diff&rev=507756&r1=507755&r2=507756
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/BrokerInfoMarshaller.cpp
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/BrokerInfoMarshaller.cpp
Wed Feb 14 16:39:17 2007
@@ -157,11 +157,11 @@
     looseMarshalString( info->getBrokerURL(), dataOut );
     looseMarshalObjectArray( wireFormat, info->getPeerBrokerInfos(), dataOut );
     looseMarshalString( info->getBrokerName(), dataOut );
-    dataOut->write( info->isSlaveBroker() );
-    dataOut->write( info->isMasterBroker() );
-    dataOut->write( info->isFaultTolerantConfiguration() );
-    dataOut->write( info->isDuplexConnection() );
-    dataOut->write( info->isNetworkConnection() );
+    dataOut->writeBoolean( info->isSlaveBroker() );
+    dataOut->writeBoolean( info->isMasterBroker() );
+    dataOut->writeBoolean( info->isFaultTolerantConfiguration() );
+    dataOut->writeBoolean( info->isDuplexConnection() );
+    dataOut->writeBoolean( info->isNetworkConnection() );
     looseMarshalLong( wireFormat, info->getConnectionId(), dataOut );
 }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConnectionControlMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConnectionControlMarshaller.cpp?view=diff&rev=507756&r1=507755&r2=507756
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConnectionControlMarshaller.cpp
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConnectionControlMarshaller.cpp
Wed Feb 14 16:39:17 2007
@@ -107,10 +107,10 @@
         dynamic_cast<ConnectionControl*>( dataStructure );
     BaseCommandMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
 
-    dataOut->write( info->isClose() );
-    dataOut->write( info->isExit() );
-    dataOut->write( info->isFaultTolerant() );
-    dataOut->write( info->isResume() );
-    dataOut->write( info->isSuspend() );
+    dataOut->writeBoolean( info->isClose() );
+    dataOut->writeBoolean( info->isExit() );
+    dataOut->writeBoolean( info->isFaultTolerant() );
+    dataOut->writeBoolean( info->isResume() );
+    dataOut->writeBoolean( info->isSuspend() );
 }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConnectionInfoMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConnectionInfoMarshaller.cpp?view=diff&rev=507756&r1=507755&r2=507756
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConnectionInfoMarshaller.cpp
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConnectionInfoMarshaller.cpp
Wed Feb 14 16:39:17 2007
@@ -150,8 +150,8 @@
     looseMarshalString( info->getPassword(), dataOut );
     looseMarshalString( info->getUserName(), dataOut );
     looseMarshalObjectArray( wireFormat, info->getBrokerPath(), dataOut );
-    dataOut->write( info->isBrokerMasterConnector() );
-    dataOut->write( info->isManageable() );
-    dataOut->write( info->isClientMaster() );
+    dataOut->writeBoolean( info->isBrokerMasterConnector() );
+    dataOut->writeBoolean( info->isManageable() );
+    dataOut->writeBoolean( info->isClientMaster() );
 }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConsumerControlMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConsumerControlMarshaller.cpp?view=diff&rev=507756&r1=507755&r2=507756
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConsumerControlMarshaller.cpp
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConsumerControlMarshaller.cpp
Wed Feb 14 16:39:17 2007
@@ -86,7 +86,7 @@
         dynamic_cast<ConsumerControl*>( dataStructure );
     bs->readBoolean();
     tightMarshalNestedObject2( wireFormat, info->getConsumerId(), dataOut, bs );
-    dataOut->write( info->getPrefetch() );
+    dataOut->writeInt( info->getPrefetch() );
     bs->readBoolean();
     bs->readBoolean();
     bs->readBoolean();
@@ -114,11 +114,11 @@
         dynamic_cast<ConsumerControl*>( dataStructure );
     BaseCommandMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
 
-    dataOut->write( info->isClose() );
+    dataOut->writeBoolean( info->isClose() );
     looseMarshalNestedObject( wireFormat, info->getConsumerId(), dataOut );
-    dataOut->write( info->getPrefetch() );
-    dataOut->write( info->isFlush() );
-    dataOut->write( info->isStart() );
-    dataOut->write( info->isStop() );
+    dataOut->writeInt( info->getPrefetch() );
+    dataOut->writeBoolean( info->isFlush() );
+    dataOut->writeBoolean( info->isStart() );
+    dataOut->writeBoolean( info->isStop() );
 }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConsumerInfoMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConsumerInfoMarshaller.cpp?view=diff&rev=507756&r1=507755&r2=507756
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConsumerInfoMarshaller.cpp
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConsumerInfoMarshaller.cpp
Wed Feb 14 16:39:17 2007
@@ -120,8 +120,8 @@
     tightMarshalCachedObject2( wireFormat, info->getConsumerId(), dataOut, bs );
     bs->readBoolean();
     tightMarshalCachedObject2( wireFormat, info->getDestination(), dataOut, bs );
-    dataOut->write( info->getPrefetchSize() );
-    dataOut->write( info->getMaximumPendingMessageLimit() );
+    dataOut->writeInt( info->getPrefetchSize() );
+    dataOut->writeInt( info->getMaximumPendingMessageLimit() );
     bs->readBoolean();
     tightMarshalString2( info->getSelector(), dataOut, bs );
     tightMarshalString2( info->getSubscriptionName(), dataOut, bs );
@@ -183,21 +183,21 @@
     BaseCommandMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
 
     looseMarshalCachedObject( wireFormat, info->getConsumerId(), dataOut );
-    dataOut->write( info->isBrowser() );
+    dataOut->writeBoolean( info->isBrowser() );
     looseMarshalCachedObject( wireFormat, info->getDestination(), dataOut );
-    dataOut->write( info->getPrefetchSize() );
-    dataOut->write( info->getMaximumPendingMessageLimit() );
-    dataOut->write( info->isDispatchAsync() );
+    dataOut->writeInt( info->getPrefetchSize() );
+    dataOut->writeInt( info->getMaximumPendingMessageLimit() );
+    dataOut->writeBoolean( info->isDispatchAsync() );
     looseMarshalString( info->getSelector(), dataOut );
     looseMarshalString( info->getSubscriptionName(), dataOut );
-    dataOut->write( info->isNoLocal() );
-    dataOut->write( info->isExclusive() );
-    dataOut->write( info->isRetroactive() );
+    dataOut->writeBoolean( info->isNoLocal() );
+    dataOut->writeBoolean( info->isExclusive() );
+    dataOut->writeBoolean( info->isRetroactive() );
     dataOut->write( info->getPriority() );
     looseMarshalObjectArray( wireFormat, info->getBrokerPath(), dataOut );
     looseMarshalNestedObject( wireFormat, info->getAdditionalPredicate(), dataOut );
-    dataOut->write( info->isNetworkSubscription() );
-    dataOut->write( info->isOptimizedAcknowledge() );
-    dataOut->write( info->isNoRangeAcks() );
+    dataOut->writeBoolean( info->isNetworkSubscription() );
+    dataOut->writeBoolean( info->isOptimizedAcknowledge() );
+    dataOut->writeBoolean( info->isNoRangeAcks() );
 }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/IntegerResponseMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/IntegerResponseMarshaller.cpp?view=diff&rev=507756&r1=507755&r2=507756
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/IntegerResponseMarshaller.cpp
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/IntegerResponseMarshaller.cpp
Wed Feb 14 16:39:17 2007
@@ -70,7 +70,7 @@
 
     IntegerResponse* info =
         dynamic_cast<IntegerResponse*>( dataStructure );
-    dataOut->write( info->getResult() );
+    dataOut->writeInt( info->getResult() );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -89,6 +89,6 @@
         dynamic_cast<IntegerResponse*>( dataStructure );
     ResponseMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
 
-    dataOut->write( info->getResult() );
+    dataOut->writeInt( info->getResult() );
 }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/JournalTransactionMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/JournalTransactionMarshaller.cpp?view=diff&rev=507756&r1=507755&r2=507756
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/JournalTransactionMarshaller.cpp
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/JournalTransactionMarshaller.cpp
Wed Feb 14 16:39:17 2007
@@ -104,6 +104,6 @@
 
     looseMarshalNestedObject( wireFormat, info->getTransactionId(), dataOut );
     dataOut->write( info->getType() );
-    dataOut->write( info->getWasPrepared() );
+    dataOut->writeBoolean( info->getWasPrepared() );
 }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/MessageAckMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/MessageAckMarshaller.cpp?view=diff&rev=507756&r1=507755&r2=507756
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/MessageAckMarshaller.cpp
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/MessageAckMarshaller.cpp
Wed Feb 14 16:39:17 2007
@@ -95,7 +95,7 @@
     dataOut->write( info->getAckType() );
     tightMarshalNestedObject2( wireFormat, info->getFirstMessageId(), dataOut, bs );
     tightMarshalNestedObject2( wireFormat, info->getLastMessageId(), dataOut, bs );
-    dataOut->write( info->getMessageCount() );
+    dataOut->writeInt( info->getMessageCount() );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -131,6 +131,6 @@
     dataOut->write( info->getAckType() );
     looseMarshalNestedObject( wireFormat, info->getFirstMessageId(), dataOut );
     looseMarshalNestedObject( wireFormat, info->getLastMessageId(), dataOut );
-    dataOut->write( info->getMessageCount() );
+    dataOut->writeInt( info->getMessageCount() );
 }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/MessageDispatchMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/MessageDispatchMarshaller.cpp?view=diff&rev=507756&r1=507755&r2=507756
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/MessageDispatchMarshaller.cpp
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/MessageDispatchMarshaller.cpp
Wed Feb 14 16:39:17 2007
@@ -85,7 +85,7 @@
     tightMarshalCachedObject2( wireFormat, info->getConsumerId(), dataOut, bs );
     tightMarshalCachedObject2( wireFormat, info->getDestination(), dataOut, bs );
     tightMarshalNestedObject2( wireFormat, info->getMessage(), dataOut, bs );
-    dataOut->write( info->getRedeliveryCounter() );
+    dataOut->writeInt( info->getRedeliveryCounter() );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -113,6 +113,6 @@
     looseMarshalCachedObject( wireFormat, info->getConsumerId(), dataOut );
     looseMarshalCachedObject( wireFormat, info->getDestination(), dataOut );
     looseMarshalNestedObject( wireFormat, info->getMessage(), dataOut );
-    dataOut->write( info->getRedeliveryCounter() );
+    dataOut->writeInt( info->getRedeliveryCounter() );
 }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/MessageMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/MessageMarshaller.cpp?view=diff&rev=507756&r1=507755&r2=507756
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/MessageMarshaller.cpp
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/MessageMarshaller.cpp
Wed Feb 14 16:39:17 2007
@@ -140,7 +140,7 @@
     tightMarshalNestedObject2( wireFormat, info->getMessageId(), dataOut, bs );
     tightMarshalCachedObject2( wireFormat, info->getOriginalTransactionId(), dataOut,
bs );
     tightMarshalString2( info->getGroupID(), dataOut, bs );
-    dataOut->write( info->getGroupSequence() );
+    dataOut->writeInt( info->getGroupSequence() );
     tightMarshalString2( info->getCorrelationId(), dataOut, bs );
     bs->readBoolean();
     tightMarshalLong2( wireFormat, info->getExpiration(), dataOut, bs );
@@ -149,17 +149,17 @@
     tightMarshalLong2( wireFormat, info->getTimestamp(), dataOut, bs );
     tightMarshalString2( info->getType(), dataOut, bs );
     if( bs->readBoolean() ) {
-        dataOut->write( (int)info->getContent().size() );
+        dataOut->writeInt( (int)info->getContent().size() );
         dataOut->write( (const unsigned char*)(&info->getContent()[0]), (int)info->getContent().size()
);
     }
     if( bs->readBoolean() ) {
-        dataOut->write( (int)info->getMarshalledProperties().size() );
+        dataOut->writeInt( (int)info->getMarshalledProperties().size() );
         dataOut->write( (const unsigned char*)(&info->getMarshalledProperties()[0]),
(int)info->getMarshalledProperties().size() );
     }
     tightMarshalNestedObject2( wireFormat, info->getDataStructure(), dataOut, bs );
     tightMarshalCachedObject2( wireFormat, info->getTargetConsumerId(), dataOut, bs );
     bs->readBoolean();
-    dataOut->write( info->getRedeliveryCounter() );
+    dataOut->writeInt( info->getRedeliveryCounter() );
     tightMarshalObjectArray2( wireFormat, info->getBrokerPath(), dataOut, bs );
     tightMarshalLong2( wireFormat, info->getArrival(), dataOut, bs );
     tightMarshalString2( info->getUserID(), dataOut, bs );
@@ -235,9 +235,9 @@
     looseMarshalNestedObject( wireFormat, info->getMessageId(), dataOut );
     looseMarshalCachedObject( wireFormat, info->getOriginalTransactionId(), dataOut );
     looseMarshalString( info->getGroupID(), dataOut );
-    dataOut->write( info->getGroupSequence() );
+    dataOut->writeInt( info->getGroupSequence() );
     looseMarshalString( info->getCorrelationId(), dataOut );
-    dataOut->write( info->isPersistent() );
+    dataOut->writeBoolean( info->isPersistent() );
     looseMarshalLong( wireFormat, info->getExpiration(), dataOut );
     dataOut->write( info->getPriority() );
     looseMarshalNestedObject( wireFormat, info->getReplyTo(), dataOut );
@@ -245,22 +245,22 @@
     looseMarshalString( info->getType(), dataOut );
     dataOut->write( info->getContent().size() != 0 );
     if( info->getContent().size() != 0 ) {
-        dataOut->write( (int)info->getContent().size() );
+        dataOut->writeInt( (int)info->getContent().size() );
         dataOut->write( (const unsigned char*)(&info->getContent()[0]), (int)info->getContent().size()
);
     }
     dataOut->write( info->getMarshalledProperties().size() != 0 );
     if( info->getMarshalledProperties().size() != 0 ) {
-        dataOut->write( (int)info->getMarshalledProperties().size() );
+        dataOut->writeInt( (int)info->getMarshalledProperties().size() );
         dataOut->write( (const unsigned char*)(&info->getMarshalledProperties()[0]),
(int)info->getMarshalledProperties().size() );
     }
     looseMarshalNestedObject( wireFormat, info->getDataStructure(), dataOut );
     looseMarshalCachedObject( wireFormat, info->getTargetConsumerId(), dataOut );
-    dataOut->write( info->isCompressed() );
-    dataOut->write( info->getRedeliveryCounter() );
+    dataOut->writeBoolean( info->isCompressed() );
+    dataOut->writeInt( info->getRedeliveryCounter() );
     looseMarshalObjectArray( wireFormat, info->getBrokerPath(), dataOut );
     looseMarshalLong( wireFormat, info->getArrival(), dataOut );
     looseMarshalString( info->getUserID(), dataOut );
-    dataOut->write( info->isRecievedByDFBridge() );
-    dataOut->write( info->isDroppable() );
+    dataOut->writeBoolean( info->isRecievedByDFBridge() );
+    dataOut->writeBoolean( info->isDroppable() );
 }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/NetworkBridgeFilterMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/NetworkBridgeFilterMarshaller.cpp?view=diff&rev=507756&r1=507755&r2=507756
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/NetworkBridgeFilterMarshaller.cpp
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/NetworkBridgeFilterMarshaller.cpp
Wed Feb 14 16:39:17 2007
@@ -76,7 +76,7 @@
 
     NetworkBridgeFilter* info =
         dynamic_cast<NetworkBridgeFilter*>( dataStructure );
-    dataOut->write( info->getNetworkTTL() );
+    dataOut->writeInt( info->getNetworkTTL() );
     tightMarshalCachedObject2( wireFormat, info->getNetworkBrokerId(), dataOut, bs );
 }
 
@@ -98,7 +98,7 @@
         dynamic_cast<NetworkBridgeFilter*>( dataStructure );
     BaseDataStreamMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
 
-    dataOut->write( info->getNetworkTTL() );
+    dataOut->writeInt( info->getNetworkTTL() );
     looseMarshalCachedObject( wireFormat, info->getNetworkBrokerId(), dataOut );
 }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/PartialCommandMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/PartialCommandMarshaller.cpp?view=diff&rev=507756&r1=507755&r2=507756
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/PartialCommandMarshaller.cpp
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/PartialCommandMarshaller.cpp
Wed Feb 14 16:39:17 2007
@@ -76,9 +76,9 @@
 
     PartialCommand* info =
         dynamic_cast<PartialCommand*>( dataStructure );
-    dataOut->write( info->getCommandId() );
+    dataOut->writeInt( info->getCommandId() );
     if( bs->readBoolean() ) {
-        dataOut->write( (int)info->getData().size() );
+        dataOut->writeInt( (int)info->getData().size() );
         dataOut->write( (const unsigned char*)(&info->getData()[0]), (int)info->getData().size()
);
     }
 }
@@ -100,10 +100,10 @@
         dynamic_cast<PartialCommand*>( dataStructure );
     BaseDataStreamMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
 
-    dataOut->write( info->getCommandId() );
+    dataOut->writeInt( info->getCommandId() );
     dataOut->write( info->getData().size() != 0 );
     if( info->getData().size() != 0 ) {
-        dataOut->write( (int)info->getData().size() );
+        dataOut->writeInt( (int)info->getData().size() );
         dataOut->write( (const unsigned char*)(&info->getData()[0]), (int)info->getData().size()
);
     }
 }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ProducerInfoMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ProducerInfoMarshaller.cpp?view=diff&rev=507756&r1=507755&r2=507756
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ProducerInfoMarshaller.cpp
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ProducerInfoMarshaller.cpp
Wed Feb 14 16:39:17 2007
@@ -134,6 +134,6 @@
     looseMarshalCachedObject( wireFormat, info->getProducerId(), dataOut );
     looseMarshalCachedObject( wireFormat, info->getDestination(), dataOut );
     looseMarshalObjectArray( wireFormat, info->getBrokerPath(), dataOut );
-    dataOut->write( info->isDispatchAsync() );
+    dataOut->writeBoolean( info->isDispatchAsync() );
 }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ReplayCommandMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ReplayCommandMarshaller.cpp?view=diff&rev=507756&r1=507755&r2=507756
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ReplayCommandMarshaller.cpp
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ReplayCommandMarshaller.cpp
Wed Feb 14 16:39:17 2007
@@ -71,8 +71,8 @@
 
     ReplayCommand* info =
         dynamic_cast<ReplayCommand*>( dataStructure );
-    dataOut->write( info->getFirstNakNumber() );
-    dataOut->write( info->getLastNakNumber() );
+    dataOut->writeInt( info->getFirstNakNumber() );
+    dataOut->writeInt( info->getLastNakNumber() );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -92,7 +92,7 @@
         dynamic_cast<ReplayCommand*>( dataStructure );
     BaseCommandMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
 
-    dataOut->write( info->getFirstNakNumber() );
-    dataOut->write( info->getLastNakNumber() );
+    dataOut->writeInt( info->getFirstNakNumber() );
+    dataOut->writeInt( info->getLastNakNumber() );
 }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ResponseMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ResponseMarshaller.cpp?view=diff&rev=507756&r1=507755&r2=507756
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ResponseMarshaller.cpp
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ResponseMarshaller.cpp
Wed Feb 14 16:39:17 2007
@@ -70,7 +70,7 @@
 
     Response* info =
         dynamic_cast<Response*>( dataStructure );
-    dataOut->write( info->getCorrelationId() );
+    dataOut->writeInt( info->getCorrelationId() );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -89,6 +89,6 @@
         dynamic_cast<Response*>( dataStructure );
     BaseCommandMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
 
-    dataOut->write( info->getCorrelationId() );
+    dataOut->writeInt( info->getCorrelationId() );
 }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/WireFormatInfoMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/WireFormatInfoMarshaller.cpp?view=diff&rev=507756&r1=507755&r2=507756
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/WireFormatInfoMarshaller.cpp
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/WireFormatInfoMarshaller.cpp
Wed Feb 14 16:39:17 2007
@@ -83,9 +83,9 @@
     WireFormatInfo* info =
         dynamic_cast<WireFormatInfo*>( dataStructure );
     dataOut->write( (const unsigned char*)(&info->getMagic()[0]), 8 );
-    dataOut->write( info->getVersion() );
+    dataOut->writeInt( info->getVersion() );
     if( bs->readBoolean() ) {
-        dataOut->write( (int)info->getMarshalledProperties().size() );
+        dataOut->writeInt( (int)info->getMarshalledProperties().size() );
         dataOut->write( (const unsigned char*)(&info->getMarshalledProperties()[0]),
(int)info->getMarshalledProperties().size() );
     }
     info->afterMarshal( wireFormat );
@@ -113,10 +113,10 @@
     BaseDataStreamMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
 
     dataOut->write( (const unsigned char*)(&info->getMagic()[0]), (int)8 );
-    dataOut->write( info->getVersion() );
+    dataOut->writeInt( info->getVersion() );
     dataOut->write( info->getMarshalledProperties().size() != 0 );
     if( info->getMarshalledProperties().size() != 0 ) {
-        dataOut->write( (int)info->getMarshalledProperties().size() );
+        dataOut->writeInt( (int)info->getMarshalledProperties().size() );
         dataOut->write( (const unsigned char*)(&info->getMarshalledProperties()[0]),
(int)info->getMarshalledProperties().size() );
     }
     info->afterMarshal( wireFormat );

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/XATransactionIdMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/XATransactionIdMarshaller.cpp?view=diff&rev=507756&r1=507755&r2=507756
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/XATransactionIdMarshaller.cpp
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/XATransactionIdMarshaller.cpp
Wed Feb 14 16:39:17 2007
@@ -79,13 +79,13 @@
 
     XATransactionId* info =
         dynamic_cast<XATransactionId*>( dataStructure );
-    dataOut->write( info->getFormatId() );
+    dataOut->writeInt( info->getFormatId() );
     if( bs->readBoolean() ) {
-        dataOut->write( (int)info->getGlobalTransactionId().size() );
+        dataOut->writeInt( (int)info->getGlobalTransactionId().size() );
         dataOut->write( (const unsigned char*)(&info->getGlobalTransactionId()[0]),
(int)info->getGlobalTransactionId().size() );
     }
     if( bs->readBoolean() ) {
-        dataOut->write( (int)info->getBranchQualifier().size() );
+        dataOut->writeInt( (int)info->getBranchQualifier().size() );
         dataOut->write( (const unsigned char*)(&info->getBranchQualifier()[0]),
(int)info->getBranchQualifier().size() );
     }
 }
@@ -108,15 +108,15 @@
         dynamic_cast<XATransactionId*>( dataStructure );
     TransactionIdMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
 
-    dataOut->write( info->getFormatId() );
+    dataOut->writeInt( info->getFormatId() );
     dataOut->write( info->getGlobalTransactionId().size() != 0 );
     if( info->getGlobalTransactionId().size() != 0 ) {
-        dataOut->write( (int)info->getGlobalTransactionId().size() );
+        dataOut->writeInt( (int)info->getGlobalTransactionId().size() );
         dataOut->write( (const unsigned char*)(&info->getGlobalTransactionId()[0]),
(int)info->getGlobalTransactionId().size() );
     }
     dataOut->write( info->getBranchQualifier().size() != 0 );
     if( info->getBranchQualifier().size() != 0 ) {
-        dataOut->write( (int)info->getBranchQualifier().size() );
+        dataOut->writeInt( (int)info->getBranchQualifier().size() );
         dataOut->write( (const unsigned char*)(&info->getBranchQualifier()[0]),
(int)info->getBranchQualifier().size() );
     }
 }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/network/SocketInputStream.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/network/SocketInputStream.cpp?view=diff&rev=507756&r1=507755&r2=507756
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/network/SocketInputStream.cpp
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/network/SocketInputStream.cpp
Wed Feb 14 16:39:17 2007
@@ -149,20 +149,7 @@
         throw IOException( __FILE__, __LINE__, 
                 "activemq::io::SocketInputStream::read - %s", SocketError::getErrorString().c_str()
);
     }
-    
-    /*if( debug ){
-        printf("SocketInputStream:read(), numbytes:%d -", len);
-        for( int ix=0; ix<len; ++ix ){
-            char c = buffer[ix];
-            if( Character::isLetterOrDigit(c) || Character::isWhitespace(c) )
-                cout << c;
-            else
-                cout << '[' << (int)(unsigned char)c << ']';
-        }
-        cout << endl;
-        cout.flush();
-    }*/
-    
+
     return len;
 }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/network/SocketOutputStream.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/network/SocketOutputStream.cpp?view=diff&rev=507756&r1=507755&r2=507756
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/network/SocketOutputStream.cpp
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/network/SocketOutputStream.cpp
Wed Feb 14 16:39:17 2007
@@ -69,19 +69,6 @@
     std::size_t remaining = len;
     int sendOpts = AMQ_SEND_OPTS;
 
-    /*if( debug ){
-        cout << "SocketOutputStream:write(), numbytes: " << len << " -
";
-        for( std::size_t ix=0; ix<len; ++ix ){
-            char c = buffer[ix];
-            if( Character::isLetterOrDigit(c) || Character::isWhitespace(c) ){
-                cout << (char)c;
-            }
-            else cout << "[" << (int)(unsigned char)c << "]";
-        }
-        cout << endl;
-        cout.flush();
-    }*/
-        
     while( remaining > 0 )
     {
         int length = ::send( socket, (const char*)buffer, (int)remaining, sendOpts );   
  	



Mime
View raw message