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 2009/07/24 22:09:44 UTC
svn commit: r797633 [2/37] - in /activemq/activemq-cpp/trunk/activemq-cpp:
./ src/main/ src/main/activemq/commands/ src/main/activemq/core/
src/main/activemq/wireformat/openwire/
src/main/activemq/wireformat/openwire/marshal/v1/ src/main/activemq/wiref...
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/Makefile.am
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/Makefile.am?rev=797633&r1=797632&r2=797633&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/Makefile.am (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/Makefile.am Fri Jul 24 20:09:31 2009
@@ -329,6 +329,130 @@
activemq/wireformat/openwire/marshal/v3/TransactionInfoMarshaller.cpp \
activemq/wireformat/openwire/marshal/v3/WireFormatInfoMarshaller.cpp \
activemq/wireformat/openwire/marshal/v3/XATransactionIdMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v4/ActiveMQBlobMessageMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v4/ActiveMQBytesMessageMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v4/ActiveMQDestinationMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v4/ActiveMQMapMessageMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v4/ActiveMQMessageMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v4/ActiveMQObjectMessageMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v4/ActiveMQQueueMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v4/ActiveMQStreamMessageMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v4/ActiveMQTempDestinationMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v4/ActiveMQTempQueueMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v4/ActiveMQTempTopicMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v4/ActiveMQTextMessageMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v4/ActiveMQTopicMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v4/BaseCommandMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v4/BrokerIdMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v4/BrokerInfoMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v4/ConnectionControlMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v4/ConnectionErrorMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v4/ConnectionIdMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v4/ConnectionInfoMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v4/ConsumerControlMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v4/ConsumerIdMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v4/ConsumerInfoMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v4/ControlCommandMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v4/DataArrayResponseMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v4/DataResponseMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v4/DestinationInfoMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v4/DiscoveryEventMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v4/ExceptionResponseMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v4/FlushCommandMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v4/IntegerResponseMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v4/JournalQueueAckMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v4/JournalTopicAckMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v4/JournalTraceMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v4/JournalTransactionMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v4/KeepAliveInfoMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v4/LastPartialCommandMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v4/LocalTransactionIdMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v4/MarshallerFactory.cpp \
+ activemq/wireformat/openwire/marshal/v4/MessageAckMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v4/MessageDispatchMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v4/MessageDispatchNotificationMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v4/MessageIdMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v4/MessageMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v4/MessagePullMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v4/NetworkBridgeFilterMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v4/PartialCommandMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v4/ProducerAckMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v4/ProducerIdMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v4/ProducerInfoMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v4/RemoveInfoMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v4/RemoveSubscriptionInfoMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v4/ReplayCommandMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v4/ResponseMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v4/SessionIdMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v4/SessionInfoMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v4/ShutdownInfoMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v4/SubscriptionInfoMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v4/TransactionIdMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v4/TransactionInfoMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v4/WireFormatInfoMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v4/XATransactionIdMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v5/ActiveMQBlobMessageMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v5/ActiveMQBytesMessageMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v5/ActiveMQDestinationMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v5/ActiveMQMapMessageMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v5/ActiveMQMessageMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v5/ActiveMQObjectMessageMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v5/ActiveMQQueueMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v5/ActiveMQStreamMessageMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v5/ActiveMQTempDestinationMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v5/ActiveMQTempQueueMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v5/ActiveMQTempTopicMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v5/ActiveMQTextMessageMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v5/ActiveMQTopicMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v5/BaseCommandMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v5/BrokerIdMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v5/BrokerInfoMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v5/ConnectionControlMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v5/ConnectionErrorMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v5/ConnectionIdMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v5/ConnectionInfoMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v5/ConsumerControlMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v5/ConsumerIdMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v5/ConsumerInfoMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v5/ControlCommandMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v5/DataArrayResponseMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v5/DataResponseMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v5/DestinationInfoMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v5/DiscoveryEventMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v5/ExceptionResponseMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v5/FlushCommandMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v5/IntegerResponseMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v5/JournalQueueAckMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v5/JournalTopicAckMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v5/JournalTraceMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v5/JournalTransactionMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v5/KeepAliveInfoMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v5/LastPartialCommandMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v5/LocalTransactionIdMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v5/MarshallerFactory.cpp \
+ activemq/wireformat/openwire/marshal/v5/MessageAckMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v5/MessageDispatchMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v5/MessageDispatchNotificationMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v5/MessageIdMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v5/MessageMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v5/MessagePullMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v5/NetworkBridgeFilterMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v5/PartialCommandMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v5/ProducerAckMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v5/ProducerIdMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v5/ProducerInfoMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v5/RemoveInfoMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v5/RemoveSubscriptionInfoMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v5/ReplayCommandMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v5/ResponseMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v5/SessionIdMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v5/SessionInfoMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v5/ShutdownInfoMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v5/SubscriptionInfoMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v5/TransactionIdMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v5/TransactionInfoMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v5/WireFormatInfoMarshaller.cpp \
+ activemq/wireformat/openwire/marshal/v5/XATransactionIdMarshaller.cpp \
activemq/wireformat/openwire/utils/BooleanStream.cpp \
activemq/wireformat/openwire/utils/HexTable.cpp \
activemq/wireformat/openwire/utils/MessagePropertyInterceptor.cpp \
@@ -778,6 +902,130 @@
activemq/wireformat/openwire/marshal/v3/TransactionInfoMarshaller.h \
activemq/wireformat/openwire/marshal/v3/WireFormatInfoMarshaller.h \
activemq/wireformat/openwire/marshal/v3/XATransactionIdMarshaller.h \
+ activemq/wireformat/openwire/marshal/v4/ActiveMQBlobMessageMarshaller.h \
+ activemq/wireformat/openwire/marshal/v4/ActiveMQBytesMessageMarshaller.h \
+ activemq/wireformat/openwire/marshal/v4/ActiveMQDestinationMarshaller.h \
+ activemq/wireformat/openwire/marshal/v4/ActiveMQMapMessageMarshaller.h \
+ activemq/wireformat/openwire/marshal/v4/ActiveMQMessageMarshaller.h \
+ activemq/wireformat/openwire/marshal/v4/ActiveMQObjectMessageMarshaller.h \
+ activemq/wireformat/openwire/marshal/v4/ActiveMQQueueMarshaller.h \
+ activemq/wireformat/openwire/marshal/v4/ActiveMQStreamMessageMarshaller.h \
+ activemq/wireformat/openwire/marshal/v4/ActiveMQTempDestinationMarshaller.h \
+ activemq/wireformat/openwire/marshal/v4/ActiveMQTempQueueMarshaller.h \
+ activemq/wireformat/openwire/marshal/v4/ActiveMQTempTopicMarshaller.h \
+ activemq/wireformat/openwire/marshal/v4/ActiveMQTextMessageMarshaller.h \
+ activemq/wireformat/openwire/marshal/v4/ActiveMQTopicMarshaller.h \
+ activemq/wireformat/openwire/marshal/v4/BaseCommandMarshaller.h \
+ activemq/wireformat/openwire/marshal/v4/BrokerIdMarshaller.h \
+ activemq/wireformat/openwire/marshal/v4/BrokerInfoMarshaller.h \
+ activemq/wireformat/openwire/marshal/v4/ConnectionControlMarshaller.h \
+ activemq/wireformat/openwire/marshal/v4/ConnectionErrorMarshaller.h \
+ activemq/wireformat/openwire/marshal/v4/ConnectionIdMarshaller.h \
+ activemq/wireformat/openwire/marshal/v4/ConnectionInfoMarshaller.h \
+ activemq/wireformat/openwire/marshal/v4/ConsumerControlMarshaller.h \
+ activemq/wireformat/openwire/marshal/v4/ConsumerIdMarshaller.h \
+ activemq/wireformat/openwire/marshal/v4/ConsumerInfoMarshaller.h \
+ activemq/wireformat/openwire/marshal/v4/ControlCommandMarshaller.h \
+ activemq/wireformat/openwire/marshal/v4/DataArrayResponseMarshaller.h \
+ activemq/wireformat/openwire/marshal/v4/DataResponseMarshaller.h \
+ activemq/wireformat/openwire/marshal/v4/DestinationInfoMarshaller.h \
+ activemq/wireformat/openwire/marshal/v4/DiscoveryEventMarshaller.h \
+ activemq/wireformat/openwire/marshal/v4/ExceptionResponseMarshaller.h \
+ activemq/wireformat/openwire/marshal/v4/FlushCommandMarshaller.h \
+ activemq/wireformat/openwire/marshal/v4/IntegerResponseMarshaller.h \
+ activemq/wireformat/openwire/marshal/v4/JournalQueueAckMarshaller.h \
+ activemq/wireformat/openwire/marshal/v4/JournalTopicAckMarshaller.h \
+ activemq/wireformat/openwire/marshal/v4/JournalTraceMarshaller.h \
+ activemq/wireformat/openwire/marshal/v4/JournalTransactionMarshaller.h \
+ activemq/wireformat/openwire/marshal/v4/KeepAliveInfoMarshaller.h \
+ activemq/wireformat/openwire/marshal/v4/LastPartialCommandMarshaller.h \
+ activemq/wireformat/openwire/marshal/v4/LocalTransactionIdMarshaller.h \
+ activemq/wireformat/openwire/marshal/v4/MarshallerFactory.h \
+ activemq/wireformat/openwire/marshal/v4/MessageAckMarshaller.h \
+ activemq/wireformat/openwire/marshal/v4/MessageDispatchMarshaller.h \
+ activemq/wireformat/openwire/marshal/v4/MessageDispatchNotificationMarshaller.h \
+ activemq/wireformat/openwire/marshal/v4/MessageIdMarshaller.h \
+ activemq/wireformat/openwire/marshal/v4/MessageMarshaller.h \
+ activemq/wireformat/openwire/marshal/v4/MessagePullMarshaller.h \
+ activemq/wireformat/openwire/marshal/v4/NetworkBridgeFilterMarshaller.h \
+ activemq/wireformat/openwire/marshal/v4/PartialCommandMarshaller.h \
+ activemq/wireformat/openwire/marshal/v4/ProducerAckMarshaller.h \
+ activemq/wireformat/openwire/marshal/v4/ProducerIdMarshaller.h \
+ activemq/wireformat/openwire/marshal/v4/ProducerInfoMarshaller.h \
+ activemq/wireformat/openwire/marshal/v4/RemoveInfoMarshaller.h \
+ activemq/wireformat/openwire/marshal/v4/RemoveSubscriptionInfoMarshaller.h \
+ activemq/wireformat/openwire/marshal/v4/ReplayCommandMarshaller.h \
+ activemq/wireformat/openwire/marshal/v4/ResponseMarshaller.h \
+ activemq/wireformat/openwire/marshal/v4/SessionIdMarshaller.h \
+ activemq/wireformat/openwire/marshal/v4/SessionInfoMarshaller.h \
+ activemq/wireformat/openwire/marshal/v4/ShutdownInfoMarshaller.h \
+ activemq/wireformat/openwire/marshal/v4/SubscriptionInfoMarshaller.h \
+ activemq/wireformat/openwire/marshal/v4/TransactionIdMarshaller.h \
+ activemq/wireformat/openwire/marshal/v4/TransactionInfoMarshaller.h \
+ activemq/wireformat/openwire/marshal/v4/WireFormatInfoMarshaller.h \
+ activemq/wireformat/openwire/marshal/v4/XATransactionIdMarshaller.h \
+ activemq/wireformat/openwire/marshal/v5/ActiveMQBlobMessageMarshaller.h \
+ activemq/wireformat/openwire/marshal/v5/ActiveMQBytesMessageMarshaller.h \
+ activemq/wireformat/openwire/marshal/v5/ActiveMQDestinationMarshaller.h \
+ activemq/wireformat/openwire/marshal/v5/ActiveMQMapMessageMarshaller.h \
+ activemq/wireformat/openwire/marshal/v5/ActiveMQMessageMarshaller.h \
+ activemq/wireformat/openwire/marshal/v5/ActiveMQObjectMessageMarshaller.h \
+ activemq/wireformat/openwire/marshal/v5/ActiveMQQueueMarshaller.h \
+ activemq/wireformat/openwire/marshal/v5/ActiveMQStreamMessageMarshaller.h \
+ activemq/wireformat/openwire/marshal/v5/ActiveMQTempDestinationMarshaller.h \
+ activemq/wireformat/openwire/marshal/v5/ActiveMQTempQueueMarshaller.h \
+ activemq/wireformat/openwire/marshal/v5/ActiveMQTempTopicMarshaller.h \
+ activemq/wireformat/openwire/marshal/v5/ActiveMQTextMessageMarshaller.h \
+ activemq/wireformat/openwire/marshal/v5/ActiveMQTopicMarshaller.h \
+ activemq/wireformat/openwire/marshal/v5/BaseCommandMarshaller.h \
+ activemq/wireformat/openwire/marshal/v5/BrokerIdMarshaller.h \
+ activemq/wireformat/openwire/marshal/v5/BrokerInfoMarshaller.h \
+ activemq/wireformat/openwire/marshal/v5/ConnectionControlMarshaller.h \
+ activemq/wireformat/openwire/marshal/v5/ConnectionErrorMarshaller.h \
+ activemq/wireformat/openwire/marshal/v5/ConnectionIdMarshaller.h \
+ activemq/wireformat/openwire/marshal/v5/ConnectionInfoMarshaller.h \
+ activemq/wireformat/openwire/marshal/v5/ConsumerControlMarshaller.h \
+ activemq/wireformat/openwire/marshal/v5/ConsumerIdMarshaller.h \
+ activemq/wireformat/openwire/marshal/v5/ConsumerInfoMarshaller.h \
+ activemq/wireformat/openwire/marshal/v5/ControlCommandMarshaller.h \
+ activemq/wireformat/openwire/marshal/v5/DataArrayResponseMarshaller.h \
+ activemq/wireformat/openwire/marshal/v5/DataResponseMarshaller.h \
+ activemq/wireformat/openwire/marshal/v5/DestinationInfoMarshaller.h \
+ activemq/wireformat/openwire/marshal/v5/DiscoveryEventMarshaller.h \
+ activemq/wireformat/openwire/marshal/v5/ExceptionResponseMarshaller.h \
+ activemq/wireformat/openwire/marshal/v5/FlushCommandMarshaller.h \
+ activemq/wireformat/openwire/marshal/v5/IntegerResponseMarshaller.h \
+ activemq/wireformat/openwire/marshal/v5/JournalQueueAckMarshaller.h \
+ activemq/wireformat/openwire/marshal/v5/JournalTopicAckMarshaller.h \
+ activemq/wireformat/openwire/marshal/v5/JournalTraceMarshaller.h \
+ activemq/wireformat/openwire/marshal/v5/JournalTransactionMarshaller.h \
+ activemq/wireformat/openwire/marshal/v5/KeepAliveInfoMarshaller.h \
+ activemq/wireformat/openwire/marshal/v5/LastPartialCommandMarshaller.h \
+ activemq/wireformat/openwire/marshal/v5/LocalTransactionIdMarshaller.h \
+ activemq/wireformat/openwire/marshal/v5/MarshallerFactory.h \
+ activemq/wireformat/openwire/marshal/v5/MessageAckMarshaller.h \
+ activemq/wireformat/openwire/marshal/v5/MessageDispatchMarshaller.h \
+ activemq/wireformat/openwire/marshal/v5/MessageDispatchNotificationMarshaller.h \
+ activemq/wireformat/openwire/marshal/v5/MessageIdMarshaller.h \
+ activemq/wireformat/openwire/marshal/v5/MessageMarshaller.h \
+ activemq/wireformat/openwire/marshal/v5/MessagePullMarshaller.h \
+ activemq/wireformat/openwire/marshal/v5/NetworkBridgeFilterMarshaller.h \
+ activemq/wireformat/openwire/marshal/v5/PartialCommandMarshaller.h \
+ activemq/wireformat/openwire/marshal/v5/ProducerAckMarshaller.h \
+ activemq/wireformat/openwire/marshal/v5/ProducerIdMarshaller.h \
+ activemq/wireformat/openwire/marshal/v5/ProducerInfoMarshaller.h \
+ activemq/wireformat/openwire/marshal/v5/RemoveInfoMarshaller.h \
+ activemq/wireformat/openwire/marshal/v5/RemoveSubscriptionInfoMarshaller.h \
+ activemq/wireformat/openwire/marshal/v5/ReplayCommandMarshaller.h \
+ activemq/wireformat/openwire/marshal/v5/ResponseMarshaller.h \
+ activemq/wireformat/openwire/marshal/v5/SessionIdMarshaller.h \
+ activemq/wireformat/openwire/marshal/v5/SessionInfoMarshaller.h \
+ activemq/wireformat/openwire/marshal/v5/ShutdownInfoMarshaller.h \
+ activemq/wireformat/openwire/marshal/v5/SubscriptionInfoMarshaller.h \
+ activemq/wireformat/openwire/marshal/v5/TransactionIdMarshaller.h \
+ activemq/wireformat/openwire/marshal/v5/TransactionInfoMarshaller.h \
+ activemq/wireformat/openwire/marshal/v5/WireFormatInfoMarshaller.h \
+ activemq/wireformat/openwire/marshal/v5/XATransactionIdMarshaller.h \
activemq/wireformat/openwire/utils/BooleanStream.h \
activemq/wireformat/openwire/utils/HexTable.h \
activemq/wireformat/openwire/utils/MessagePropertyInterceptor.h \
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConsumerInfo.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConsumerInfo.cpp?rev=797633&r1=797632&r2=797633&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConsumerInfo.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConsumerInfo.cpp Fri Jul 24 20:09:31 2009
@@ -105,6 +105,7 @@
this->setNetworkSubscription( srcPtr->isNetworkSubscription() );
this->setOptimizedAcknowledge( srcPtr->isOptimizedAcknowledge() );
this->setNoRangeAcks( srcPtr->isNoRangeAcks() );
+ this->setNetworkConsumerPath( srcPtr->getNetworkConsumerPath() );
}
////////////////////////////////////////////////////////////////////////////////
@@ -158,6 +159,14 @@
stream << " Value of NetworkSubscription = " << this->isNetworkSubscription() << std::endl;
stream << " Value of OptimizedAcknowledge = " << this->isOptimizedAcknowledge() << std::endl;
stream << " Value of NoRangeAcks = " << this->isNoRangeAcks() << std::endl;
+ for( size_t inetworkConsumerPath = 0; inetworkConsumerPath < this->getNetworkConsumerPath().size(); ++inetworkConsumerPath ) {
+ stream << " Value of NetworkConsumerPath[" << inetworkConsumerPath << "] is Below:" << std::endl;
+ if( this->getNetworkConsumerPath()[inetworkConsumerPath] != NULL ) {
+ stream << this->getNetworkConsumerPath()[inetworkConsumerPath]->toString() << std::endl;
+ } else {
+ stream << " Object is NULL" << std::endl;
+ }
+ }
stream << BaseCommand::toString();
stream << "End Class = ConsumerInfo" << std::endl;
@@ -246,6 +255,15 @@
if( this->isNoRangeAcks() != valuePtr->isNoRangeAcks() ) {
return false;
}
+ for( size_t inetworkConsumerPath = 0; inetworkConsumerPath < this->getNetworkConsumerPath().size(); ++inetworkConsumerPath ) {
+ if( this->getNetworkConsumerPath()[inetworkConsumerPath] != NULL ) {
+ if( !this->getNetworkConsumerPath()[inetworkConsumerPath]->equals( valuePtr->getNetworkConsumerPath()[inetworkConsumerPath].get() ) ) {
+ return false;
+ }
+ } else if( valuePtr->getNetworkConsumerPath()[inetworkConsumerPath] != NULL ) {
+ return false;
+ }
+ }
if( !BaseCommand::equals( value ) ) {
return false;
}
@@ -453,6 +471,21 @@
}
////////////////////////////////////////////////////////////////////////////////
+const std::vector< decaf::lang::Pointer<ConsumerId> >& ConsumerInfo::getNetworkConsumerPath() const {
+ return networkConsumerPath;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+std::vector< decaf::lang::Pointer<ConsumerId> >& ConsumerInfo::getNetworkConsumerPath() {
+ return networkConsumerPath;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void ConsumerInfo::setNetworkConsumerPath( const std::vector< decaf::lang::Pointer<ConsumerId> >& networkConsumerPath ) {
+ this->networkConsumerPath = networkConsumerPath;
+}
+
+////////////////////////////////////////////////////////////////////////////////
decaf::lang::Pointer<commands::Command> ConsumerInfo::visit( activemq::state::CommandVisitor* visitor )
throw( activemq::exceptions::ActiveMQException ) {
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConsumerInfo.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConsumerInfo.h?rev=797633&r1=797632&r2=797633&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConsumerInfo.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConsumerInfo.h Fri Jul 24 20:09:31 2009
@@ -67,6 +67,7 @@
bool networkSubscription;
bool optimizedAcknowledge;
bool noRangeAcks;
+ std::vector< decaf::lang::Pointer<ConsumerId> > networkConsumerPath;
public:
@@ -176,6 +177,10 @@
virtual bool isNoRangeAcks() const;
virtual void setNoRangeAcks( bool noRangeAcks );
+ virtual const std::vector< decaf::lang::Pointer<ConsumerId> >& getNetworkConsumerPath() const;
+ virtual std::vector< decaf::lang::Pointer<ConsumerId> >& getNetworkConsumerPath();
+ virtual void setNetworkConsumerPath( const std::vector< decaf::lang::Pointer<ConsumerId> >& networkConsumerPath );
+
/**
* @return an answer of true to the isConsumerInfo() query.
*/
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/RemoveInfo.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/RemoveInfo.cpp?rev=797633&r1=797632&r2=797633&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/RemoveInfo.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/RemoveInfo.cpp Fri Jul 24 20:09:31 2009
@@ -40,6 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
RemoveInfo::RemoveInfo() : BaseCommand() {
+ this->lastDeliveredSequenceId = 0;
}
////////////////////////////////////////////////////////////////////////////////
@@ -76,6 +77,7 @@
BaseCommand::copyDataStructure( src );
this->setObjectId( srcPtr->getObjectId() );
+ this->setLastDeliveredSequenceId( srcPtr->getLastDeliveredSequenceId() );
}
////////////////////////////////////////////////////////////////////////////////
@@ -96,6 +98,7 @@
} else {
stream << " Object is NULL" << std::endl;
}
+ stream << " Value of LastDeliveredSequenceId = " << this->getLastDeliveredSequenceId() << std::endl;
stream << BaseCommand::toString();
stream << "End Class = RemoveInfo" << std::endl;
@@ -122,6 +125,9 @@
} else if( valuePtr->getObjectId() != NULL ) {
return false;
}
+ if( this->getLastDeliveredSequenceId() != valuePtr->getLastDeliveredSequenceId() ) {
+ return false;
+ }
if( !BaseCommand::equals( value ) ) {
return false;
}
@@ -144,6 +150,16 @@
}
////////////////////////////////////////////////////////////////////////////////
+long long RemoveInfo::getLastDeliveredSequenceId() const {
+ return lastDeliveredSequenceId;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void RemoveInfo::setLastDeliveredSequenceId( long long lastDeliveredSequenceId ) {
+ this->lastDeliveredSequenceId = lastDeliveredSequenceId;
+}
+
+////////////////////////////////////////////////////////////////////////////////
decaf::lang::Pointer<commands::Command> RemoveInfo::visit( activemq::state::CommandVisitor* visitor )
throw( activemq::exceptions::ActiveMQException ) {
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/RemoveInfo.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/RemoveInfo.h?rev=797633&r1=797632&r2=797633&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/RemoveInfo.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/RemoveInfo.h Fri Jul 24 20:09:31 2009
@@ -48,6 +48,7 @@
protected:
Pointer<DataStructure> objectId;
+ long long lastDeliveredSequenceId;
public:
@@ -104,6 +105,9 @@
virtual Pointer<DataStructure>& getObjectId();
virtual void setObjectId( const Pointer<DataStructure>& objectId );
+ virtual long long getLastDeliveredSequenceId() const;
+ virtual void setLastDeliveredSequenceId( long long lastDeliveredSequenceId );
+
/**
* @return an answer of true to the isRemoveInfo() query.
*/
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnection.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnection.cpp?rev=797633&r1=797632&r2=797633&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnection.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnection.cpp Fri Jul 24 20:09:31 2009
@@ -332,7 +332,9 @@
try{
// Remove our ConnectionId from the Broker
- disposeOf( connectionInfo->getConnectionId(), this->getCloseTimeout() );
+ Pointer<RemoveInfo> command( new RemoveInfo() );
+ command->setObjectId( this->connectionInfo->getConnectionId() );
+ this->syncRequest( command, this->getCloseTimeout() );
// Send the disconnect command to the broker.
Pointer<ShutdownInfo> shutdown( new ShutdownInfo() );
@@ -588,35 +590,6 @@
}
////////////////////////////////////////////////////////////////////////////////
-void ActiveMQConnection::disposeOf( const Pointer<DataStructure>& objectId )
- throw ( ActiveMQException ) {
-
- try{
- Pointer<RemoveInfo> command( new RemoveInfo() );
- command->setObjectId( objectId );
- oneway( command );
- }
- AMQ_CATCH_RETHROW( ActiveMQException )
- AMQ_CATCH_EXCEPTION_CONVERT( Exception, ActiveMQException )
- AMQ_CATCHALL_THROW( ActiveMQException )
-}
-
-////////////////////////////////////////////////////////////////////////////////
-void ActiveMQConnection::disposeOf( const Pointer<DataStructure>& objectId,
- unsigned int timeout )
- throw ( ActiveMQException ) {
-
- try{
- Pointer<RemoveInfo> command( new RemoveInfo() );
- command->setObjectId( objectId );
- this->syncRequest( command, timeout );
- }
- AMQ_CATCH_RETHROW( ActiveMQException )
- AMQ_CATCH_EXCEPTION_CONVERT( Exception, ActiveMQException )
- AMQ_CATCHALL_THROW( ActiveMQException )
-}
-
-////////////////////////////////////////////////////////////////////////////////
void ActiveMQConnection::enforceConnected() const throw ( ActiveMQException ) {
if( this->isClosed() ) {
throw ActiveMQException(
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnection.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnection.h?rev=797633&r1=797632&r2=797633&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnection.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnection.h Fri Jul 24 20:09:31 2009
@@ -388,27 +388,6 @@
throw ( activemq::exceptions::ActiveMQException );
/**
- * Sends a message to the broker to dispose of the given resource
- * using an async oneway call.
- * @param objectId The ID of the resource to be released.
- * @throw ConnectorException if any problems occur from sending
- * the message.
- */
- void disposeOf( const Pointer<commands::DataStructure>& objectId )
- throw ( activemq::exceptions::ActiveMQException );
-
- /**
- * Sends a message to the broker to dispose of the given resource
- * using a timed request.
- * @param objectId The ID of the resource to be released.
- * @param timeout The time to wait for a response that the object is disposed.
- * @throw ConnectorException if any problems occur from sending
- * the message.
- */
- void disposeOf( const Pointer<commands::DataStructure>& objectId, unsigned int timeout )
- throw ( activemq::exceptions::ActiveMQException );
-
- /**
* Notify the exception listener
* @param ex the exception to fire
*/
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConsumer.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConsumer.cpp?rev=797633&r1=797632&r2=797633&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConsumer.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConsumer.cpp Fri Jul 24 20:09:31 2009
@@ -134,7 +134,7 @@
this->session = session;
this->transaction = transaction;
this->consumerInfo = consumerInfo;
- this->lastDeliveredSequenceId = 0;
+ this->lastDeliveredSequenceId = -1;
this->synchronizationRegistered = false;
this->additionalWindowSize = 0;
this->redeliveryDelay = 0;
@@ -212,10 +212,6 @@
deliverAcks();
}
- // Remove this Consumer from the Connections set of Dispatchers and then
- // remove it from the Broker.
- this->session->disposeOf( this->consumerInfo->getConsumerId() );
-
this->started.set( false );
// Identifies any errors encountered during shutdown.
@@ -236,6 +232,10 @@
// Stop and Wakeup all sync consumers.
unconsumedMessages.close();
+ // Remove this Consumer from the Connections set of Dispatchers and then
+ // remove it from the Broker.
+ this->session->disposeOf( this->consumerInfo->getConsumerId(), lastDeliveredSequenceId );
+
// If we encountered an error, propagate it.
if( haveException ){
error.setMark( __FILE__, __LINE__ );
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConsumer.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConsumer.h?rev=797633&r1=797632&r2=797633&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConsumer.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConsumer.h Fri Jul 24 20:09:31 2009
@@ -316,6 +316,25 @@
*/
void clearMessagesInProgress();
+ /**
+ * Gets the currently set Last Delivered Sequence Id
+ *
+ * @returns long long containing the sequence id of the last delivered Message.
+ */
+ long long getLastDeliveredSequenceId() const {
+ return this->lastDeliveredSequenceId;
+ }
+
+ /**
+ * Sets the value of the Last Delivered Sequence Id
+ *
+ * @param value
+ * The new value to assign to the Last Delivered Sequence Id property.
+ */
+ void setLastDeliveredSequenceId( long long value ) {
+ this->lastDeliveredSequenceId = value;
+ }
+
protected:
/**
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQSession.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQSession.cpp?rev=797633&r1=797632&r2=797633&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQSession.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQSession.cpp Fri Jul 24 20:09:31 2009
@@ -40,6 +40,7 @@
#include <activemq/commands/ActiveMQTempTopic.h>
#include <activemq/commands/ActiveMQTempQueue.h>
#include <activemq/commands/MessagePull.h>
+#include <activemq/commands/RemoveInfo.h>
#include <activemq/commands/ProducerInfo.h>
#include <activemq/commands/TransactionInfo.h>
#include <activemq/commands/RemoveSubscriptionInfo.h>
@@ -47,6 +48,7 @@
#include <decaf/lang/Boolean.h>
#include <decaf/lang/Integer.h>
#include <decaf/lang/Long.h>
+#include <decaf/lang/Math.h>
#include <decaf/util/Queue.h>
#include <decaf/lang/exceptions/InvalidStateException.h>
#include <decaf/lang/exceptions/NullPointerException.h>
@@ -77,6 +79,7 @@
this->connection = connection;
this->closed = false;
this->ackMode = ackMode;
+ this->lastDeliveredSequenceId = -1;
// Create a Transaction object only if the session is transacted
if( this->isTransacted() ) {
@@ -152,7 +155,10 @@
}
// Remove this session from the Broker.
- this->connection->disposeOf( this->sessionInfo->getSessionId() );
+ Pointer<RemoveInfo> info( new RemoveInfo() );
+ info->setObjectId( this->sessionInfo->getSessionId() );
+ info->setLastDeliveredSequenceId( this->lastDeliveredSequenceId );
+ this->connection->oneway( info );
// Remove this sessions from the connector
this->connection->removeSession( this );
@@ -1027,7 +1033,7 @@
}
////////////////////////////////////////////////////////////////////////////////
-void ActiveMQSession::disposeOf( Pointer<ConsumerId> id )
+void ActiveMQSession::disposeOf( Pointer<ConsumerId> id, long long lastDeliveredSequenceId )
throw ( activemq::exceptions::ActiveMQException ) {
try{
@@ -1041,7 +1047,15 @@
// Remove this Id both from the Sessions Map of Consumers and from
// the Connection.
this->connection->removeDispatcher( id );
- this->connection->disposeOf( id );
+
+ // Remove at the Broker Side.
+ Pointer<RemoveInfo> info( new RemoveInfo );
+ info->setObjectId( id );
+ info->setLastDeliveredSequenceId( lastDeliveredSequenceId );
+ this->connection->oneway( info );
+ this->lastDeliveredSequenceId =
+ Math::max( this->lastDeliveredSequenceId, lastDeliveredSequenceId );
+
this->consumers.remove( id );
}
}
@@ -1064,7 +1078,12 @@
if( this->producers.containsKey( id ) ) {
this->connection->removeProducer( id );
- this->connection->disposeOf( id );
+
+ // Remove at the Broker Side.
+ Pointer<RemoveInfo> info( new RemoveInfo );
+ info->setObjectId( id );
+ this->connection->oneway( info );
+
this->producers.remove( id );
}
}
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQSession.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQSession.h?rev=797633&r1=797632&r2=797633&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQSession.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQSession.h Fri Jul 24 20:09:31 2009
@@ -123,6 +123,11 @@
*/
util::LongSequenceGenerator consumerIds;
+ /**
+ * Last Delivered Sequence Id
+ */
+ long long lastDeliveredSequenceId;
+
public:
ActiveMQSession( const Pointer<commands::SessionInfo>& sessionInfo,
@@ -497,6 +502,25 @@
}
/**
+ * Gets the currently set Last Delivered Sequence Id
+ *
+ * @returns long long containing the sequence id of the last delivered Message.
+ */
+ long long getLastDeliveredSequenceId() const {
+ return this->lastDeliveredSequenceId;
+ }
+
+ /**
+ * Sets the value of the Last Delivered Sequence Id
+ *
+ * @param value
+ * The new value to assign to the Last Delivered Sequence Id property.
+ */
+ void setLastDeliveredSequenceId( long long value ) {
+ this->lastDeliveredSequenceId = value;
+ }
+
+ /**
* Sends a oneway message.
* @param command The message to send.
* @throws ActiveMQException if not currently connected, or
@@ -520,10 +544,15 @@
* Dispose of a Consumer from this session. Removes it from the Connection
* and clean up any resources associated with it.
*
- * @param id - the Id of the Consumer to dispose.
+ * @param id
+ * The Id of the Consumer to dispose.
+ *
+ * @param lastDeliveredSequenceId
+ * The Broker Sequence Id of the last message the Consumer delivered.
+ *
* @throw ActiveMQException if an internal error occurs.
*/
- void disposeOf( decaf::lang::Pointer<commands::ConsumerId> id )
+ void disposeOf( decaf::lang::Pointer<commands::ConsumerId> id, long long lastDeliveredSequenceId )
throw ( activemq::exceptions::ActiveMQException );
/**
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/OpenWireFormat.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/OpenWireFormat.cpp?rev=797633&r1=797632&r2=797633&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/OpenWireFormat.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/OpenWireFormat.cpp Fri Jul 24 20:09:31 2009
@@ -29,6 +29,8 @@
#include <activemq/commands/WireFormatInfo.h>
#include <activemq/commands/DataStructure.h>
#include <activemq/wireformat/openwire/marshal/DataStreamMarshaller.h>
+#include <activemq/wireformat/openwire/marshal/v5/MarshallerFactory.h>
+#include <activemq/wireformat/openwire/marshal/v4/MarshallerFactory.h>
#include <activemq/wireformat/openwire/marshal/v3/MarshallerFactory.h>
#include <activemq/wireformat/openwire/marshal/v2/MarshallerFactory.h>
#include <activemq/wireformat/openwire/marshal/v1/MarshallerFactory.h>
@@ -133,6 +135,12 @@
case 3:
v3::MarshallerFactory().configure( this );
break;
+ case 4:
+ v4::MarshallerFactory().configure( this );
+ break;
+ case 5:
+ v5::MarshallerFactory().configure( this );
+ break;
default:
throw IllegalArgumentException(
__FILE__, __LINE__,
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/OpenWireFormatFactory.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/OpenWireFormatFactory.cpp?rev=797633&r1=797632&r2=797633&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/OpenWireFormatFactory.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/OpenWireFormatFactory.cpp Fri Jul 24 20:09:31 2009
@@ -45,7 +45,7 @@
// Configure the version to use
info->setVersion( Integer::parseInt(
- properties.getProperty( "wireFormat.version", "3" ) ) );
+ properties.getProperty( "wireFormat.version", "5" ) ) );
// parse params out of the properties
info->setStackTraceEnabled( Boolean::parseBoolean(
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQBlobMessageMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQBlobMessageMarshaller.cpp?rev=797633&r1=797632&r2=797633&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQBlobMessageMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQBlobMessageMarshaller.cpp Fri Jul 24 20:09:31 2009
@@ -57,11 +57,6 @@
MessageMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs );
- ActiveMQBlobMessage* info =
- dynamic_cast<ActiveMQBlobMessage*>( dataStructure );
- info->setRemoteBlobUrl( tightUnmarshalString( dataIn, bs ) );
- info->setMimeType( tightUnmarshalString( dataIn, bs ) );
- info->setDeletedByBroker( bs->readBoolean() );
}
AMQ_CATCH_RETHROW( decaf::io::IOException )
AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
@@ -73,13 +68,7 @@
try {
- ActiveMQBlobMessage* info =
- dynamic_cast<ActiveMQBlobMessage*>( dataStructure );
-
int rc = MessageMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
- rc += tightMarshalString1( info->getRemoteBlobUrl(), bs );
- rc += tightMarshalString1( info->getMimeType(), bs );
- bs->writeBoolean( info->isDeletedByBroker() );
return rc + 0;
}
@@ -95,11 +84,6 @@
MessageMarshaller::tightMarshal2( wireFormat, dataStructure, dataOut, bs );
- ActiveMQBlobMessage* info =
- dynamic_cast<ActiveMQBlobMessage*>( dataStructure );
- tightMarshalString2( info->getRemoteBlobUrl(), dataOut, bs );
- tightMarshalString2( info->getMimeType(), dataOut, bs );
- bs->readBoolean();
}
AMQ_CATCH_RETHROW( decaf::io::IOException )
AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
@@ -112,11 +96,6 @@
try {
MessageMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
- ActiveMQBlobMessage* info =
- dynamic_cast<ActiveMQBlobMessage*>( dataStructure );
- info->setRemoteBlobUrl( looseUnmarshalString( dataIn ) );
- info->setMimeType( looseUnmarshalString( dataIn ) );
- info->setDeletedByBroker( dataIn->readBoolean() );
}
AMQ_CATCH_RETHROW( decaf::io::IOException )
AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
@@ -128,13 +107,8 @@
try {
- ActiveMQBlobMessage* info =
- dynamic_cast<ActiveMQBlobMessage*>( dataStructure );
MessageMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
- looseMarshalString( info->getRemoteBlobUrl(), dataOut );
- looseMarshalString( info->getMimeType(), dataOut );
- dataOut->writeBoolean( info->isDeletedByBroker() );
}
AMQ_CATCH_RETHROW( decaf::io::IOException )
AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v1/BrokerInfoMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v1/BrokerInfoMarshaller.cpp?rev=797633&r1=797632&r2=797633&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v1/BrokerInfoMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v1/BrokerInfoMarshaller.cpp Fri Jul 24 20:09:31 2009
@@ -78,11 +78,6 @@
info->setSlaveBroker( bs->readBoolean() );
info->setMasterBroker( bs->readBoolean() );
info->setFaultTolerantConfiguration( bs->readBoolean() );
- info->setDuplexConnection( bs->readBoolean() );
- info->setNetworkConnection( bs->readBoolean() );
- info->setConnectionId( tightUnmarshalLong( wireFormat, dataIn, bs ) );
- info->setBrokerUploadUrl( tightUnmarshalString( dataIn, bs ) );
- info->setNetworkProperties( tightUnmarshalString( dataIn, bs ) );
}
AMQ_CATCH_RETHROW( decaf::io::IOException )
AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
@@ -105,11 +100,6 @@
bs->writeBoolean( info->isSlaveBroker() );
bs->writeBoolean( info->isMasterBroker() );
bs->writeBoolean( info->isFaultTolerantConfiguration() );
- bs->writeBoolean( info->isDuplexConnection() );
- bs->writeBoolean( info->isNetworkConnection() );
- rc += tightMarshalLong1( wireFormat, info->getConnectionId(), bs );
- rc += tightMarshalString1( info->getBrokerUploadUrl(), bs );
- rc += tightMarshalString1( info->getNetworkProperties(), bs );
return rc + 0;
}
@@ -134,11 +124,6 @@
bs->readBoolean();
bs->readBoolean();
bs->readBoolean();
- bs->readBoolean();
- bs->readBoolean();
- tightMarshalLong2( wireFormat, info->getConnectionId(), dataOut, bs );
- tightMarshalString2( info->getBrokerUploadUrl(), dataOut, bs );
- tightMarshalString2( info->getNetworkProperties(), dataOut, bs );
}
AMQ_CATCH_RETHROW( decaf::io::IOException )
AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
@@ -172,11 +157,6 @@
info->setSlaveBroker( dataIn->readBoolean() );
info->setMasterBroker( dataIn->readBoolean() );
info->setFaultTolerantConfiguration( dataIn->readBoolean() );
- info->setDuplexConnection( dataIn->readBoolean() );
- info->setNetworkConnection( dataIn->readBoolean() );
- info->setConnectionId( looseUnmarshalLong( wireFormat, dataIn ) );
- info->setBrokerUploadUrl( looseUnmarshalString( dataIn ) );
- info->setNetworkProperties( looseUnmarshalString( dataIn ) );
}
AMQ_CATCH_RETHROW( decaf::io::IOException )
AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
@@ -199,11 +179,6 @@
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 );
- looseMarshalString( info->getBrokerUploadUrl(), dataOut );
- looseMarshalString( info->getNetworkProperties(), dataOut );
}
AMQ_CATCH_RETHROW( decaf::io::IOException )
AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v1/ConnectionInfoMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v1/ConnectionInfoMarshaller.cpp?rev=797633&r1=797632&r2=797633&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v1/ConnectionInfoMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v1/ConnectionInfoMarshaller.cpp Fri Jul 24 20:09:31 2009
@@ -78,7 +78,6 @@
}
info->setBrokerMasterConnector( bs->readBoolean() );
info->setManageable( bs->readBoolean() );
- info->setClientMaster( bs->readBoolean() );
}
AMQ_CATCH_RETHROW( decaf::io::IOException )
AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
@@ -101,7 +100,6 @@
rc += tightMarshalObjectArray1( wireFormat, info->getBrokerPath(), bs );
bs->writeBoolean( info->isBrokerMasterConnector() );
bs->writeBoolean( info->isManageable() );
- bs->writeBoolean( info->isClientMaster() );
return rc + 0;
}
@@ -126,7 +124,6 @@
tightMarshalObjectArray2( wireFormat, info->getBrokerPath(), dataOut, bs );
bs->readBoolean();
bs->readBoolean();
- bs->readBoolean();
}
AMQ_CATCH_RETHROW( decaf::io::IOException )
AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
@@ -160,7 +157,6 @@
}
info->setBrokerMasterConnector( dataIn->readBoolean() );
info->setManageable( dataIn->readBoolean() );
- info->setClientMaster( dataIn->readBoolean() );
}
AMQ_CATCH_RETHROW( decaf::io::IOException )
AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
@@ -183,7 +179,6 @@
looseMarshalObjectArray( wireFormat, info->getBrokerPath(), dataOut );
dataOut->writeBoolean( info->isBrokerMasterConnector() );
dataOut->writeBoolean( info->isManageable() );
- dataOut->writeBoolean( info->isClientMaster() );
}
AMQ_CATCH_RETHROW( decaf::io::IOException )
AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v1/ConsumerControlMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v1/ConsumerControlMarshaller.cpp?rev=797633&r1=797632&r2=797633&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v1/ConsumerControlMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v1/ConsumerControlMarshaller.cpp Fri Jul 24 20:09:31 2009
@@ -63,9 +63,6 @@
info->setConsumerId( Pointer<ConsumerId>( dynamic_cast< ConsumerId* >(
tightUnmarshalNestedObject( wireFormat, dataIn, bs ) ) ) );
info->setPrefetch( dataIn->readInt() );
- info->setFlush( bs->readBoolean() );
- info->setStart( bs->readBoolean() );
- info->setStop( bs->readBoolean() );
}
AMQ_CATCH_RETHROW( decaf::io::IOException )
AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
@@ -83,9 +80,6 @@
int rc = BaseCommandMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
bs->writeBoolean( info->isClose() );
rc += tightMarshalNestedObject1( wireFormat, info->getConsumerId().get(), bs );
- bs->writeBoolean( info->isFlush() );
- bs->writeBoolean( info->isStart() );
- bs->writeBoolean( info->isStop() );
return rc + 4;
}
@@ -106,9 +100,6 @@
bs->readBoolean();
tightMarshalNestedObject2( wireFormat, info->getConsumerId().get(), dataOut, bs );
dataOut->writeInt( info->getPrefetch() );
- bs->readBoolean();
- bs->readBoolean();
- bs->readBoolean();
}
AMQ_CATCH_RETHROW( decaf::io::IOException )
AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
@@ -127,9 +118,6 @@
info->setConsumerId( Pointer<ConsumerId>( dynamic_cast< ConsumerId* >(
looseUnmarshalNestedObject( wireFormat, dataIn ) ) ) );
info->setPrefetch( dataIn->readInt() );
- info->setFlush( dataIn->readBoolean() );
- info->setStart( dataIn->readBoolean() );
- info->setStop( dataIn->readBoolean() );
}
AMQ_CATCH_RETHROW( decaf::io::IOException )
AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
@@ -148,9 +136,6 @@
dataOut->writeBoolean( info->isClose() );
looseMarshalNestedObject( wireFormat, info->getConsumerId().get(), dataOut );
dataOut->writeInt( info->getPrefetch() );
- dataOut->writeBoolean( info->isFlush() );
- dataOut->writeBoolean( info->isStart() );
- dataOut->writeBoolean( info->isStop() );
}
AMQ_CATCH_RETHROW( decaf::io::IOException )
AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v1/MessageMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v1/MessageMarshaller.cpp?rev=797633&r1=797632&r2=797633&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v1/MessageMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v1/MessageMarshaller.cpp Fri Jul 24 20:09:31 2009
@@ -94,21 +94,6 @@
info->setArrival( tightUnmarshalLong( wireFormat, dataIn, bs ) );
info->setUserID( tightUnmarshalString( dataIn, bs ) );
info->setRecievedByDFBridge( bs->readBoolean() );
- info->setDroppable( bs->readBoolean() );
-
- if( bs->readBoolean() ) {
- short size = dataIn->readShort();
- info->getCluster().reserve( size );
- for( int i = 0; i < size; i++ ) {
- info->getCluster().push_back( Pointer<BrokerId>( dynamic_cast< BrokerId* >(
- tightUnmarshalNestedObject( wireFormat, dataIn, bs ) ) ) );
- }
- }
- else {
- info->getCluster().clear();
- }
- info->setBrokerInTime( tightUnmarshalLong( wireFormat, dataIn, bs ) );
- info->setBrokerOutTime( tightUnmarshalLong( wireFormat, dataIn, bs ) );
}
AMQ_CATCH_RETHROW( decaf::io::IOException )
AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
@@ -148,10 +133,6 @@
rc += tightMarshalLong1( wireFormat, info->getArrival(), bs );
rc += tightMarshalString1( info->getUserID(), bs );
bs->writeBoolean( info->isRecievedByDFBridge() );
- bs->writeBoolean( info->isDroppable() );
- rc += tightMarshalObjectArray1( wireFormat, info->getCluster(), bs );
- rc += tightMarshalLong1( wireFormat, info->getBrokerInTime(), bs );
- rc += tightMarshalLong1( wireFormat, info->getBrokerOutTime(), bs );
return rc + 9;
}
@@ -200,10 +181,6 @@
tightMarshalLong2( wireFormat, info->getArrival(), dataOut, bs );
tightMarshalString2( info->getUserID(), dataOut, bs );
bs->readBoolean();
- bs->readBoolean();
- tightMarshalObjectArray2( wireFormat, info->getCluster(), dataOut, bs );
- tightMarshalLong2( wireFormat, info->getBrokerInTime(), dataOut, bs );
- tightMarshalLong2( wireFormat, info->getBrokerOutTime(), dataOut, bs );
}
AMQ_CATCH_RETHROW( decaf::io::IOException )
AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
@@ -263,21 +240,6 @@
info->setArrival( looseUnmarshalLong( wireFormat, dataIn ) );
info->setUserID( looseUnmarshalString( dataIn ) );
info->setRecievedByDFBridge( dataIn->readBoolean() );
- info->setDroppable( dataIn->readBoolean() );
-
- if( dataIn->readBoolean() ) {
- short size = dataIn->readShort();
- info->getCluster().reserve( size );
- for( int i = 0; i < size; i++ ) {
- info->getCluster().push_back( Pointer<BrokerId>( dynamic_cast<BrokerId* >(
- looseUnmarshalNestedObject( wireFormat, dataIn ) ) ) );
- }
- }
- else {
- info->getCluster().clear();
- }
- info->setBrokerInTime( looseUnmarshalLong( wireFormat, dataIn ) );
- info->setBrokerOutTime( looseUnmarshalLong( wireFormat, dataIn ) );
}
AMQ_CATCH_RETHROW( decaf::io::IOException )
AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
@@ -326,10 +288,6 @@
looseMarshalLong( wireFormat, info->getArrival(), dataOut );
looseMarshalString( info->getUserID(), dataOut );
dataOut->writeBoolean( info->isRecievedByDFBridge() );
- dataOut->writeBoolean( info->isDroppable() );
- looseMarshalObjectArray( wireFormat, info->getCluster(), dataOut );
- looseMarshalLong( wireFormat, info->getBrokerInTime(), dataOut );
- looseMarshalLong( wireFormat, info->getBrokerOutTime(), dataOut );
}
AMQ_CATCH_RETHROW( decaf::io::IOException )
AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v1/MessagePullMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v1/MessagePullMarshaller.cpp?rev=797633&r1=797632&r2=797633&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v1/MessagePullMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v1/MessagePullMarshaller.cpp Fri Jul 24 20:09:31 2009
@@ -64,9 +64,6 @@
info->setDestination( Pointer<ActiveMQDestination>( dynamic_cast< ActiveMQDestination* >(
tightUnmarshalCachedObject( wireFormat, dataIn, bs ) ) ) );
info->setTimeout( tightUnmarshalLong( wireFormat, dataIn, bs ) );
- info->setCorrelationId( tightUnmarshalString( dataIn, bs ) );
- info->setMessageId( Pointer<MessageId>( dynamic_cast< MessageId* >(
- tightUnmarshalNestedObject( wireFormat, dataIn, bs ) ) ) );
}
AMQ_CATCH_RETHROW( decaf::io::IOException )
AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
@@ -85,8 +82,6 @@
rc += tightMarshalCachedObject1( wireFormat, info->getConsumerId().get(), bs );
rc += tightMarshalCachedObject1( wireFormat, info->getDestination().get(), bs );
rc += tightMarshalLong1( wireFormat, info->getTimeout(), bs );
- rc += tightMarshalString1( info->getCorrelationId(), bs );
- rc += tightMarshalNestedObject1( wireFormat, info->getMessageId().get(), bs );
return rc + 0;
}
@@ -107,8 +102,6 @@
tightMarshalCachedObject2( wireFormat, info->getConsumerId().get(), dataOut, bs );
tightMarshalCachedObject2( wireFormat, info->getDestination().get(), dataOut, bs );
tightMarshalLong2( wireFormat, info->getTimeout(), dataOut, bs );
- tightMarshalString2( info->getCorrelationId(), dataOut, bs );
- tightMarshalNestedObject2( wireFormat, info->getMessageId().get(), dataOut, bs );
}
AMQ_CATCH_RETHROW( decaf::io::IOException )
AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
@@ -128,9 +121,6 @@
info->setDestination( Pointer<ActiveMQDestination>( dynamic_cast< ActiveMQDestination* >(
looseUnmarshalCachedObject( wireFormat, dataIn ) ) ) );
info->setTimeout( looseUnmarshalLong( wireFormat, dataIn ) );
- info->setCorrelationId( looseUnmarshalString( dataIn ) );
- info->setMessageId( Pointer<MessageId>( dynamic_cast< MessageId* >(
- looseUnmarshalNestedObject( wireFormat, dataIn ) ) ) );
}
AMQ_CATCH_RETHROW( decaf::io::IOException )
AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
@@ -149,8 +139,6 @@
looseMarshalCachedObject( wireFormat, info->getConsumerId().get(), dataOut );
looseMarshalCachedObject( wireFormat, info->getDestination().get(), dataOut );
looseMarshalLong( wireFormat, info->getTimeout(), dataOut );
- looseMarshalString( info->getCorrelationId(), dataOut );
- looseMarshalNestedObject( wireFormat, info->getMessageId().get(), dataOut );
}
AMQ_CATCH_RETHROW( decaf::io::IOException )
AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v1/ProducerAckMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v1/ProducerAckMarshaller.cpp?rev=797633&r1=797632&r2=797633&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v1/ProducerAckMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v1/ProducerAckMarshaller.cpp Fri Jul 24 20:09:31 2009
@@ -57,11 +57,6 @@
BaseCommandMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs );
- ProducerAck* info =
- dynamic_cast<ProducerAck*>( dataStructure );
- info->setProducerId( Pointer<ProducerId>( dynamic_cast< ProducerId* >(
- tightUnmarshalNestedObject( wireFormat, dataIn, bs ) ) ) );
- info->setSize( dataIn->readInt() );
}
AMQ_CATCH_RETHROW( decaf::io::IOException )
AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
@@ -73,13 +68,9 @@
try {
- ProducerAck* info =
- dynamic_cast<ProducerAck*>( dataStructure );
-
int rc = BaseCommandMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
- rc += tightMarshalNestedObject1( wireFormat, info->getProducerId().get(), bs );
- return rc + 4;
+ return rc + 0;
}
AMQ_CATCH_RETHROW( decaf::io::IOException )
AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
@@ -93,10 +84,6 @@
BaseCommandMarshaller::tightMarshal2( wireFormat, dataStructure, dataOut, bs );
- ProducerAck* info =
- dynamic_cast<ProducerAck*>( dataStructure );
- tightMarshalNestedObject2( wireFormat, info->getProducerId().get(), dataOut, bs );
- dataOut->writeInt( info->getSize() );
}
AMQ_CATCH_RETHROW( decaf::io::IOException )
AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
@@ -109,11 +96,6 @@
try {
BaseCommandMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
- ProducerAck* info =
- dynamic_cast<ProducerAck*>( dataStructure );
- info->setProducerId( Pointer<ProducerId>( dynamic_cast< ProducerId* >(
- looseUnmarshalNestedObject( wireFormat, dataIn ) ) ) );
- info->setSize( dataIn->readInt() );
}
AMQ_CATCH_RETHROW( decaf::io::IOException )
AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
@@ -125,12 +107,8 @@
try {
- ProducerAck* info =
- dynamic_cast<ProducerAck*>( dataStructure );
BaseCommandMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
- looseMarshalNestedObject( wireFormat, info->getProducerId().get(), dataOut );
- dataOut->writeInt( info->getSize() );
}
AMQ_CATCH_RETHROW( decaf::io::IOException )
AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v1/ProducerInfoMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v1/ProducerInfoMarshaller.cpp?rev=797633&r1=797632&r2=797633&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v1/ProducerInfoMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v1/ProducerInfoMarshaller.cpp Fri Jul 24 20:09:31 2009
@@ -75,8 +75,6 @@
else {
info->getBrokerPath().clear();
}
- info->setDispatchAsync( bs->readBoolean() );
- info->setWindowSize( dataIn->readInt() );
}
AMQ_CATCH_RETHROW( decaf::io::IOException )
AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
@@ -95,9 +93,8 @@
rc += tightMarshalCachedObject1( wireFormat, info->getProducerId().get(), bs );
rc += tightMarshalCachedObject1( wireFormat, info->getDestination().get(), bs );
rc += tightMarshalObjectArray1( wireFormat, info->getBrokerPath(), bs );
- bs->writeBoolean( info->isDispatchAsync() );
- return rc + 4;
+ return rc + 0;
}
AMQ_CATCH_RETHROW( decaf::io::IOException )
AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
@@ -116,8 +113,6 @@
tightMarshalCachedObject2( wireFormat, info->getProducerId().get(), dataOut, bs );
tightMarshalCachedObject2( wireFormat, info->getDestination().get(), dataOut, bs );
tightMarshalObjectArray2( wireFormat, info->getBrokerPath(), dataOut, bs );
- bs->readBoolean();
- dataOut->writeInt( info->getWindowSize() );
}
AMQ_CATCH_RETHROW( decaf::io::IOException )
AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
@@ -148,8 +143,6 @@
else {
info->getBrokerPath().clear();
}
- info->setDispatchAsync( dataIn->readBoolean() );
- info->setWindowSize( dataIn->readInt() );
}
AMQ_CATCH_RETHROW( decaf::io::IOException )
AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
@@ -168,8 +161,6 @@
looseMarshalCachedObject( wireFormat, info->getProducerId().get(), dataOut );
looseMarshalCachedObject( wireFormat, info->getDestination().get(), dataOut );
looseMarshalObjectArray( wireFormat, info->getBrokerPath(), dataOut );
- dataOut->writeBoolean( info->isDispatchAsync() );
- dataOut->writeInt( info->getWindowSize() );
}
AMQ_CATCH_RETHROW( decaf::io::IOException )
AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v1/SubscriptionInfoMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v1/SubscriptionInfoMarshaller.cpp?rev=797633&r1=797632&r2=797633&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v1/SubscriptionInfoMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v1/SubscriptionInfoMarshaller.cpp Fri Jul 24 20:09:31 2009
@@ -64,8 +64,6 @@
tightUnmarshalCachedObject( wireFormat, dataIn, bs ) ) ) );
info->setSelector( tightUnmarshalString( dataIn, bs ) );
info->setSubcriptionName( tightUnmarshalString( dataIn, bs ) );
- info->setSubscribedDestination( Pointer<ActiveMQDestination>( dynamic_cast< ActiveMQDestination* >(
- tightUnmarshalNestedObject( wireFormat, dataIn, bs ) ) ) );
}
AMQ_CATCH_RETHROW( decaf::io::IOException )
AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
@@ -85,7 +83,6 @@
rc += tightMarshalCachedObject1( wireFormat, info->getDestination().get(), bs );
rc += tightMarshalString1( info->getSelector(), bs );
rc += tightMarshalString1( info->getSubcriptionName(), bs );
- rc += tightMarshalNestedObject1( wireFormat, info->getSubscribedDestination().get(), bs );
return rc + 0;
}
@@ -107,7 +104,6 @@
tightMarshalCachedObject2( wireFormat, info->getDestination().get(), dataOut, bs );
tightMarshalString2( info->getSelector(), dataOut, bs );
tightMarshalString2( info->getSubcriptionName(), dataOut, bs );
- tightMarshalNestedObject2( wireFormat, info->getSubscribedDestination().get(), dataOut, bs );
}
AMQ_CATCH_RETHROW( decaf::io::IOException )
AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
@@ -127,8 +123,6 @@
looseUnmarshalCachedObject( wireFormat, dataIn ) ) ) );
info->setSelector( looseUnmarshalString( dataIn ) );
info->setSubcriptionName( looseUnmarshalString( dataIn ) );
- info->setSubscribedDestination( Pointer<ActiveMQDestination>( dynamic_cast< ActiveMQDestination* >(
- looseUnmarshalNestedObject( wireFormat, dataIn ) ) ) );
}
AMQ_CATCH_RETHROW( decaf::io::IOException )
AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
@@ -148,7 +142,6 @@
looseMarshalCachedObject( wireFormat, info->getDestination().get(), dataOut );
looseMarshalString( info->getSelector(), dataOut );
looseMarshalString( info->getSubcriptionName(), dataOut );
- looseMarshalNestedObject( wireFormat, info->getSubscribedDestination().get(), dataOut );
}
AMQ_CATCH_RETHROW( decaf::io::IOException )
AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v2/ActiveMQBlobMessageMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v2/ActiveMQBlobMessageMarshaller.cpp?rev=797633&r1=797632&r2=797633&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v2/ActiveMQBlobMessageMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v2/ActiveMQBlobMessageMarshaller.cpp Fri Jul 24 20:09:31 2009
@@ -57,11 +57,6 @@
MessageMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs );
- ActiveMQBlobMessage* info =
- dynamic_cast<ActiveMQBlobMessage*>( dataStructure );
- info->setRemoteBlobUrl( tightUnmarshalString( dataIn, bs ) );
- info->setMimeType( tightUnmarshalString( dataIn, bs ) );
- info->setDeletedByBroker( bs->readBoolean() );
}
AMQ_CATCH_RETHROW( decaf::io::IOException )
AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
@@ -73,13 +68,7 @@
try {
- ActiveMQBlobMessage* info =
- dynamic_cast<ActiveMQBlobMessage*>( dataStructure );
-
int rc = MessageMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
- rc += tightMarshalString1( info->getRemoteBlobUrl(), bs );
- rc += tightMarshalString1( info->getMimeType(), bs );
- bs->writeBoolean( info->isDeletedByBroker() );
return rc + 0;
}
@@ -95,11 +84,6 @@
MessageMarshaller::tightMarshal2( wireFormat, dataStructure, dataOut, bs );
- ActiveMQBlobMessage* info =
- dynamic_cast<ActiveMQBlobMessage*>( dataStructure );
- tightMarshalString2( info->getRemoteBlobUrl(), dataOut, bs );
- tightMarshalString2( info->getMimeType(), dataOut, bs );
- bs->readBoolean();
}
AMQ_CATCH_RETHROW( decaf::io::IOException )
AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
@@ -112,11 +96,6 @@
try {
MessageMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
- ActiveMQBlobMessage* info =
- dynamic_cast<ActiveMQBlobMessage*>( dataStructure );
- info->setRemoteBlobUrl( looseUnmarshalString( dataIn ) );
- info->setMimeType( looseUnmarshalString( dataIn ) );
- info->setDeletedByBroker( dataIn->readBoolean() );
}
AMQ_CATCH_RETHROW( decaf::io::IOException )
AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
@@ -128,13 +107,8 @@
try {
- ActiveMQBlobMessage* info =
- dynamic_cast<ActiveMQBlobMessage*>( dataStructure );
MessageMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
- looseMarshalString( info->getRemoteBlobUrl(), dataOut );
- looseMarshalString( info->getMimeType(), dataOut );
- dataOut->writeBoolean( info->isDeletedByBroker() );
}
AMQ_CATCH_RETHROW( decaf::io::IOException )
AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v2/BrokerInfoMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v2/BrokerInfoMarshaller.cpp?rev=797633&r1=797632&r2=797633&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v2/BrokerInfoMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v2/BrokerInfoMarshaller.cpp Fri Jul 24 20:09:31 2009
@@ -81,8 +81,6 @@
info->setDuplexConnection( bs->readBoolean() );
info->setNetworkConnection( bs->readBoolean() );
info->setConnectionId( tightUnmarshalLong( wireFormat, dataIn, bs ) );
- info->setBrokerUploadUrl( tightUnmarshalString( dataIn, bs ) );
- info->setNetworkProperties( tightUnmarshalString( dataIn, bs ) );
}
AMQ_CATCH_RETHROW( decaf::io::IOException )
AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
@@ -108,8 +106,6 @@
bs->writeBoolean( info->isDuplexConnection() );
bs->writeBoolean( info->isNetworkConnection() );
rc += tightMarshalLong1( wireFormat, info->getConnectionId(), bs );
- rc += tightMarshalString1( info->getBrokerUploadUrl(), bs );
- rc += tightMarshalString1( info->getNetworkProperties(), bs );
return rc + 0;
}
@@ -137,8 +133,6 @@
bs->readBoolean();
bs->readBoolean();
tightMarshalLong2( wireFormat, info->getConnectionId(), dataOut, bs );
- tightMarshalString2( info->getBrokerUploadUrl(), dataOut, bs );
- tightMarshalString2( info->getNetworkProperties(), dataOut, bs );
}
AMQ_CATCH_RETHROW( decaf::io::IOException )
AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
@@ -175,8 +169,6 @@
info->setDuplexConnection( dataIn->readBoolean() );
info->setNetworkConnection( dataIn->readBoolean() );
info->setConnectionId( looseUnmarshalLong( wireFormat, dataIn ) );
- info->setBrokerUploadUrl( looseUnmarshalString( dataIn ) );
- info->setNetworkProperties( looseUnmarshalString( dataIn ) );
}
AMQ_CATCH_RETHROW( decaf::io::IOException )
AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
@@ -202,8 +194,6 @@
dataOut->writeBoolean( info->isDuplexConnection() );
dataOut->writeBoolean( info->isNetworkConnection() );
looseMarshalLong( wireFormat, info->getConnectionId(), dataOut );
- looseMarshalString( info->getBrokerUploadUrl(), dataOut );
- looseMarshalString( info->getNetworkProperties(), dataOut );
}
AMQ_CATCH_RETHROW( decaf::io::IOException )
AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v2/MessageMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v2/MessageMarshaller.cpp?rev=797633&r1=797632&r2=797633&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v2/MessageMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v2/MessageMarshaller.cpp Fri Jul 24 20:09:31 2009
@@ -95,20 +95,6 @@
info->setUserID( tightUnmarshalString( dataIn, bs ) );
info->setRecievedByDFBridge( bs->readBoolean() );
info->setDroppable( bs->readBoolean() );
-
- if( bs->readBoolean() ) {
- short size = dataIn->readShort();
- info->getCluster().reserve( size );
- for( int i = 0; i < size; i++ ) {
- info->getCluster().push_back( Pointer<BrokerId>( dynamic_cast< BrokerId* >(
- tightUnmarshalNestedObject( wireFormat, dataIn, bs ) ) ) );
- }
- }
- else {
- info->getCluster().clear();
- }
- info->setBrokerInTime( tightUnmarshalLong( wireFormat, dataIn, bs ) );
- info->setBrokerOutTime( tightUnmarshalLong( wireFormat, dataIn, bs ) );
}
AMQ_CATCH_RETHROW( decaf::io::IOException )
AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
@@ -149,9 +135,6 @@
rc += tightMarshalString1( info->getUserID(), bs );
bs->writeBoolean( info->isRecievedByDFBridge() );
bs->writeBoolean( info->isDroppable() );
- rc += tightMarshalObjectArray1( wireFormat, info->getCluster(), bs );
- rc += tightMarshalLong1( wireFormat, info->getBrokerInTime(), bs );
- rc += tightMarshalLong1( wireFormat, info->getBrokerOutTime(), bs );
return rc + 9;
}
@@ -201,9 +184,6 @@
tightMarshalString2( info->getUserID(), dataOut, bs );
bs->readBoolean();
bs->readBoolean();
- tightMarshalObjectArray2( wireFormat, info->getCluster(), dataOut, bs );
- tightMarshalLong2( wireFormat, info->getBrokerInTime(), dataOut, bs );
- tightMarshalLong2( wireFormat, info->getBrokerOutTime(), dataOut, bs );
}
AMQ_CATCH_RETHROW( decaf::io::IOException )
AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
@@ -264,20 +244,6 @@
info->setUserID( looseUnmarshalString( dataIn ) );
info->setRecievedByDFBridge( dataIn->readBoolean() );
info->setDroppable( dataIn->readBoolean() );
-
- if( dataIn->readBoolean() ) {
- short size = dataIn->readShort();
- info->getCluster().reserve( size );
- for( int i = 0; i < size; i++ ) {
- info->getCluster().push_back( Pointer<BrokerId>( dynamic_cast<BrokerId* >(
- looseUnmarshalNestedObject( wireFormat, dataIn ) ) ) );
- }
- }
- else {
- info->getCluster().clear();
- }
- info->setBrokerInTime( looseUnmarshalLong( wireFormat, dataIn ) );
- info->setBrokerOutTime( looseUnmarshalLong( wireFormat, dataIn ) );
}
AMQ_CATCH_RETHROW( decaf::io::IOException )
AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
@@ -327,9 +293,6 @@
looseMarshalString( info->getUserID(), dataOut );
dataOut->writeBoolean( info->isRecievedByDFBridge() );
dataOut->writeBoolean( info->isDroppable() );
- looseMarshalObjectArray( wireFormat, info->getCluster(), dataOut );
- looseMarshalLong( wireFormat, info->getBrokerInTime(), dataOut );
- looseMarshalLong( wireFormat, info->getBrokerOutTime(), dataOut );
}
AMQ_CATCH_RETHROW( decaf::io::IOException )
AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v2/MessagePullMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v2/MessagePullMarshaller.cpp?rev=797633&r1=797632&r2=797633&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v2/MessagePullMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/v2/MessagePullMarshaller.cpp Fri Jul 24 20:09:31 2009
@@ -64,9 +64,6 @@
info->setDestination( Pointer<ActiveMQDestination>( dynamic_cast< ActiveMQDestination* >(
tightUnmarshalCachedObject( wireFormat, dataIn, bs ) ) ) );
info->setTimeout( tightUnmarshalLong( wireFormat, dataIn, bs ) );
- info->setCorrelationId( tightUnmarshalString( dataIn, bs ) );
- info->setMessageId( Pointer<MessageId>( dynamic_cast< MessageId* >(
- tightUnmarshalNestedObject( wireFormat, dataIn, bs ) ) ) );
}
AMQ_CATCH_RETHROW( decaf::io::IOException )
AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
@@ -85,8 +82,6 @@
rc += tightMarshalCachedObject1( wireFormat, info->getConsumerId().get(), bs );
rc += tightMarshalCachedObject1( wireFormat, info->getDestination().get(), bs );
rc += tightMarshalLong1( wireFormat, info->getTimeout(), bs );
- rc += tightMarshalString1( info->getCorrelationId(), bs );
- rc += tightMarshalNestedObject1( wireFormat, info->getMessageId().get(), bs );
return rc + 0;
}
@@ -107,8 +102,6 @@
tightMarshalCachedObject2( wireFormat, info->getConsumerId().get(), dataOut, bs );
tightMarshalCachedObject2( wireFormat, info->getDestination().get(), dataOut, bs );
tightMarshalLong2( wireFormat, info->getTimeout(), dataOut, bs );
- tightMarshalString2( info->getCorrelationId(), dataOut, bs );
- tightMarshalNestedObject2( wireFormat, info->getMessageId().get(), dataOut, bs );
}
AMQ_CATCH_RETHROW( decaf::io::IOException )
AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
@@ -128,9 +121,6 @@
info->setDestination( Pointer<ActiveMQDestination>( dynamic_cast< ActiveMQDestination* >(
looseUnmarshalCachedObject( wireFormat, dataIn ) ) ) );
info->setTimeout( looseUnmarshalLong( wireFormat, dataIn ) );
- info->setCorrelationId( looseUnmarshalString( dataIn ) );
- info->setMessageId( Pointer<MessageId>( dynamic_cast< MessageId* >(
- looseUnmarshalNestedObject( wireFormat, dataIn ) ) ) );
}
AMQ_CATCH_RETHROW( decaf::io::IOException )
AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
@@ -149,8 +139,6 @@
looseMarshalCachedObject( wireFormat, info->getConsumerId().get(), dataOut );
looseMarshalCachedObject( wireFormat, info->getDestination().get(), dataOut );
looseMarshalLong( wireFormat, info->getTimeout(), dataOut );
- looseMarshalString( info->getCorrelationId(), dataOut );
- looseMarshalNestedObject( wireFormat, info->getMessageId().get(), dataOut );
}
AMQ_CATCH_RETHROW( decaf::io::IOException )
AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )