Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ProducerId.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ProducerId.cpp?rev=926754&r1=926753&r2=926754&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ProducerId.cpp (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ProducerId.cpp Tue Mar 23 19:50:25 2010 @@ -41,27 +41,30 @@ using namespace decaf::lang::exceptions; */ //////////////////////////////////////////////////////////////////////////////// -ProducerId::ProducerId() : BaseDataStructure() { +ProducerId::ProducerId() + : BaseDataStructure(), parentId(), connectionId(""), value(0), sessionId(0) { - this->connectionId = ""; - this->value = 0; - this->sessionId = 0; } //////////////////////////////////////////////////////////////////////////////// -ProducerId::ProducerId( const ProducerId& other ) : BaseDataStructure() { +ProducerId::ProducerId( const ProducerId& other ) + : BaseDataStructure(), parentId(), connectionId(""), value(0), sessionId(0) { + this->copyDataStructure( &other ); } //////////////////////////////////////////////////////////////////////////////// -ProducerId::ProducerId( const SessionId& sessionId, long long consumerId ) { +ProducerId::ProducerId( const SessionId& sessionId, long long consumerId ) + : BaseDataStructure(), parentId(), connectionId(""), value(0), sessionId(0) { + this->connectionId = sessionId.getConnectionId(); this->sessionId = sessionId.getValue(); this->value = consumerId; } //////////////////////////////////////////////////////////////////////////////// -ProducerId::ProducerId( std::string producerKey ) { +ProducerId::ProducerId( std::string producerKey ) + : BaseDataStructure(), parentId(), connectionId(""), value(0), sessionId(0) { // Parse off the producerId std::size_t p = producerKey.rfind( ':' );
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ProducerInfo.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ProducerInfo.cpp?rev=926754&r1=926753&r2=926754&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ProducerInfo.cpp (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ProducerInfo.cpp Tue Mar 23 19:50:25 2010 @@ -38,10 +38,9 @@ using namespace decaf::lang::exceptions; */ //////////////////////////////////////////////////////////////////////////////// -ProducerInfo::ProducerInfo() : BaseCommand() { +ProducerInfo::ProducerInfo() + : BaseCommand(), producerId(NULL), destination(NULL), brokerPath(NULL), dispatchAsync(false), windowSize(0) { - this->dispatchAsync = false; - this->windowSize = 0; } //////////////////////////////////////////////////////////////////////////////// Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ProducerInfo.h URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ProducerInfo.h?rev=926754&r1=926753&r2=926754&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ProducerInfo.h (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ProducerInfo.h Tue Mar 23 19:50:25 2010 @@ -60,10 +60,10 @@ namespace commands{ const static unsigned char ID_PRODUCERINFO = 6; - protected: + private: - ProducerInfo( const ProducerInfo& ) : BaseCommand() {}; - ProducerInfo& operator= ( const ProducerInfo& ) { return *this; }; + ProducerInfo( const ProducerInfo& ); + ProducerInfo& operator= ( const ProducerInfo& ); public: 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=926754&r1=926753&r2=926754&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 Tue Mar 23 19:50:25 2010 @@ -38,9 +38,9 @@ using namespace decaf::lang::exceptions; */ //////////////////////////////////////////////////////////////////////////////// -RemoveInfo::RemoveInfo() : BaseCommand() { +RemoveInfo::RemoveInfo() + : BaseCommand(), objectId(NULL), lastDeliveredSequenceId(0) { - this->lastDeliveredSequenceId = 0; } //////////////////////////////////////////////////////////////////////////////// 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=926754&r1=926753&r2=926754&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 Tue Mar 23 19:50:25 2010 @@ -54,10 +54,10 @@ namespace commands{ const static unsigned char ID_REMOVEINFO = 12; - protected: + private: - RemoveInfo( const RemoveInfo& ) : BaseCommand() {}; - RemoveInfo& operator= ( const RemoveInfo& ) { return *this; }; + RemoveInfo( const RemoveInfo& ); + RemoveInfo& operator= ( const RemoveInfo& ); public: Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/RemoveSubscriptionInfo.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/RemoveSubscriptionInfo.cpp?rev=926754&r1=926753&r2=926754&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/RemoveSubscriptionInfo.cpp (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/RemoveSubscriptionInfo.cpp Tue Mar 23 19:50:25 2010 @@ -38,10 +38,9 @@ using namespace decaf::lang::exceptions; */ //////////////////////////////////////////////////////////////////////////////// -RemoveSubscriptionInfo::RemoveSubscriptionInfo() : BaseCommand() { +RemoveSubscriptionInfo::RemoveSubscriptionInfo() + : BaseCommand(), connectionId(NULL), subcriptionName(""), clientId("") { - this->subcriptionName = ""; - this->clientId = ""; } //////////////////////////////////////////////////////////////////////////////// Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/RemoveSubscriptionInfo.h URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/RemoveSubscriptionInfo.h?rev=926754&r1=926753&r2=926754&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/RemoveSubscriptionInfo.h (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/RemoveSubscriptionInfo.h Tue Mar 23 19:50:25 2010 @@ -55,10 +55,10 @@ namespace commands{ const static unsigned char ID_REMOVESUBSCRIPTIONINFO = 9; - protected: + private: - RemoveSubscriptionInfo( const RemoveSubscriptionInfo& ) : BaseCommand() {}; - RemoveSubscriptionInfo& operator= ( const RemoveSubscriptionInfo& ) { return *this; }; + RemoveSubscriptionInfo( const RemoveSubscriptionInfo& ); + RemoveSubscriptionInfo& operator= ( const RemoveSubscriptionInfo& ); public: Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ReplayCommand.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ReplayCommand.cpp?rev=926754&r1=926753&r2=926754&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ReplayCommand.cpp (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ReplayCommand.cpp Tue Mar 23 19:50:25 2010 @@ -38,10 +38,9 @@ using namespace decaf::lang::exceptions; */ //////////////////////////////////////////////////////////////////////////////// -ReplayCommand::ReplayCommand() : BaseCommand() { +ReplayCommand::ReplayCommand() + : BaseCommand(), firstNakNumber(0), lastNakNumber(0) { - this->firstNakNumber = 0; - this->lastNakNumber = 0; } //////////////////////////////////////////////////////////////////////////////// Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ReplayCommand.h URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ReplayCommand.h?rev=926754&r1=926753&r2=926754&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ReplayCommand.h (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ReplayCommand.h Tue Mar 23 19:50:25 2010 @@ -53,10 +53,10 @@ namespace commands{ const static unsigned char ID_REPLAYCOMMAND = 65; - protected: + private: - ReplayCommand( const ReplayCommand& ) : BaseCommand() {}; - ReplayCommand& operator= ( const ReplayCommand& ) { return *this; }; + ReplayCommand( const ReplayCommand& ); + ReplayCommand& operator= ( const ReplayCommand& ); public: Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/Response.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/Response.cpp?rev=926754&r1=926753&r2=926754&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/Response.cpp (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/Response.cpp Tue Mar 23 19:50:25 2010 @@ -38,9 +38,9 @@ using namespace decaf::lang::exceptions; */ //////////////////////////////////////////////////////////////////////////////// -Response::Response() : BaseCommand() { +Response::Response() + : BaseCommand(), correlationId(0) { - this->correlationId = 0; } //////////////////////////////////////////////////////////////////////////////// Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/Response.h URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/Response.h?rev=926754&r1=926753&r2=926754&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/Response.h (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/Response.h Tue Mar 23 19:50:25 2010 @@ -52,10 +52,10 @@ namespace commands{ const static unsigned char ID_RESPONSE = 30; - protected: + private: - Response( const Response& ) : BaseCommand() {}; - Response& operator= ( const Response& ) { return *this; }; + Response( const Response& ); + Response& operator= ( const Response& ); public: Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/SessionId.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/SessionId.cpp?rev=926754&r1=926753&r2=926754&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/SessionId.cpp (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/SessionId.cpp Tue Mar 23 19:50:25 2010 @@ -43,31 +43,38 @@ using namespace decaf::lang::exceptions; */ //////////////////////////////////////////////////////////////////////////////// -SessionId::SessionId() : BaseDataStructure() { +SessionId::SessionId() + : BaseDataStructure(), parentId(), connectionId(""), value(0) { - this->connectionId = ""; - this->value = 0; } //////////////////////////////////////////////////////////////////////////////// -SessionId::SessionId( const SessionId& other ) : BaseDataStructure() { +SessionId::SessionId( const SessionId& other ) + : BaseDataStructure(), parentId(), connectionId(""), value(0) { + this->copyDataStructure( &other ); } //////////////////////////////////////////////////////////////////////////////// -SessionId::SessionId( const ConnectionId* connectionId, long long sessionId ) { +SessionId::SessionId( const ConnectionId* connectionId, long long sessionId ) + : BaseDataStructure(), parentId(), connectionId(""), value(0) { + this->connectionId = connectionId->getValue(); this->value = sessionId; } //////////////////////////////////////////////////////////////////////////////// -SessionId::SessionId( const ProducerId* producerId ) { +SessionId::SessionId( const ProducerId* producerId ) + : BaseDataStructure(), parentId(), connectionId(""), value(0) { + this->connectionId = producerId->getConnectionId(); this->value = producerId->getSessionId(); } //////////////////////////////////////////////////////////////////////////////// -SessionId::SessionId( const ConsumerId* consumerId ) { +SessionId::SessionId( const ConsumerId* consumerId ) + : BaseDataStructure(), parentId(), connectionId(""), value(0) { + this->connectionId = consumerId->getConnectionId(); this->value = consumerId->getSessionId(); } Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/SessionInfo.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/SessionInfo.cpp?rev=926754&r1=926753&r2=926754&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/SessionInfo.cpp (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/SessionInfo.cpp Tue Mar 23 19:50:25 2010 @@ -39,9 +39,9 @@ using namespace decaf::lang::exceptions; */ //////////////////////////////////////////////////////////////////////////////// -SessionInfo::SessionInfo() : BaseCommand() { +SessionInfo::SessionInfo() + : BaseCommand(), ackMode((unsigned int)cms::Session::AUTO_ACKNOWLEDGE), sessionId(NULL) { - this->ackMode = (unsigned int)cms::Session::AUTO_ACKNOWLEDGE; } //////////////////////////////////////////////////////////////////////////////// Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/SessionInfo.h URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/SessionInfo.h?rev=926754&r1=926753&r2=926754&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/SessionInfo.h (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/SessionInfo.h Tue Mar 23 19:50:25 2010 @@ -59,10 +59,10 @@ namespace commands{ const static unsigned char ID_SESSIONINFO = 4; - protected: + private: - SessionInfo( const SessionInfo& ) : BaseCommand() {}; - SessionInfo& operator= ( const SessionInfo& ) { return *this; }; + SessionInfo( const SessionInfo& ); + SessionInfo& operator= ( const SessionInfo& ); public: Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ShutdownInfo.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ShutdownInfo.cpp?rev=926754&r1=926753&r2=926754&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ShutdownInfo.cpp (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ShutdownInfo.cpp Tue Mar 23 19:50:25 2010 @@ -38,7 +38,8 @@ using namespace decaf::lang::exceptions; */ //////////////////////////////////////////////////////////////////////////////// -ShutdownInfo::ShutdownInfo() : BaseCommand() { +ShutdownInfo::ShutdownInfo() + : BaseCommand() { } Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ShutdownInfo.h URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ShutdownInfo.h?rev=926754&r1=926753&r2=926754&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ShutdownInfo.h (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ShutdownInfo.h Tue Mar 23 19:50:25 2010 @@ -51,10 +51,10 @@ namespace commands{ const static unsigned char ID_SHUTDOWNINFO = 11; - protected: + private: - ShutdownInfo( const ShutdownInfo& ) : BaseCommand() {}; - ShutdownInfo& operator= ( const ShutdownInfo& ) { return *this; }; + ShutdownInfo( const ShutdownInfo& ); + ShutdownInfo& operator= ( const ShutdownInfo& ); public: Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/SubscriptionInfo.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/SubscriptionInfo.cpp?rev=926754&r1=926753&r2=926754&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/SubscriptionInfo.cpp (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/SubscriptionInfo.cpp Tue Mar 23 19:50:25 2010 @@ -38,11 +38,9 @@ using namespace decaf::lang::exceptions; */ //////////////////////////////////////////////////////////////////////////////// -SubscriptionInfo::SubscriptionInfo() : BaseDataStructure() { +SubscriptionInfo::SubscriptionInfo() + : BaseDataStructure(), clientId(""), destination(NULL), selector(""), subcriptionName(""), subscribedDestination(NULL) { - this->clientId = ""; - this->selector = ""; - this->subcriptionName = ""; } //////////////////////////////////////////////////////////////////////////////// Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/SubscriptionInfo.h URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/SubscriptionInfo.h?rev=926754&r1=926753&r2=926754&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/SubscriptionInfo.h (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/SubscriptionInfo.h Tue Mar 23 19:50:25 2010 @@ -57,10 +57,10 @@ namespace commands{ const static unsigned char ID_SUBSCRIPTIONINFO = 55; - protected: + private: - SubscriptionInfo( const SubscriptionInfo& ) : BaseDataStructure() {}; - SubscriptionInfo& operator= ( const SubscriptionInfo& ) { return *this; }; + SubscriptionInfo( const SubscriptionInfo& ); + SubscriptionInfo& operator= ( const SubscriptionInfo& ); public: Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/TransactionId.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/TransactionId.cpp?rev=926754&r1=926753&r2=926754&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/TransactionId.cpp (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/TransactionId.cpp Tue Mar 23 19:50:25 2010 @@ -39,12 +39,15 @@ using namespace decaf::lang::exceptions; */ //////////////////////////////////////////////////////////////////////////////// -TransactionId::TransactionId() : BaseDataStructure() { +TransactionId::TransactionId() + : BaseDataStructure() { } //////////////////////////////////////////////////////////////////////////////// -TransactionId::TransactionId( const TransactionId& other ) : BaseDataStructure() { +TransactionId::TransactionId( const TransactionId& other ) + : BaseDataStructure() { + this->copyDataStructure( &other ); } Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/TransactionInfo.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/TransactionInfo.cpp?rev=926754&r1=926753&r2=926754&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/TransactionInfo.cpp (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/TransactionInfo.cpp Tue Mar 23 19:50:25 2010 @@ -38,9 +38,9 @@ using namespace decaf::lang::exceptions; */ //////////////////////////////////////////////////////////////////////////////// -TransactionInfo::TransactionInfo() : BaseCommand() { +TransactionInfo::TransactionInfo() + : BaseCommand(), connectionId(NULL), transactionId(NULL), type(0) { - this->type = 0; } //////////////////////////////////////////////////////////////////////////////// Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/TransactionInfo.h URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/TransactionInfo.h?rev=926754&r1=926753&r2=926754&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/TransactionInfo.h (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/TransactionInfo.h Tue Mar 23 19:50:25 2010 @@ -56,10 +56,10 @@ namespace commands{ const static unsigned char ID_TRANSACTIONINFO = 7; - protected: + private: - TransactionInfo( const TransactionInfo& ) : BaseCommand() {}; - TransactionInfo& operator= ( const TransactionInfo& ) { return *this; }; + TransactionInfo( const TransactionInfo& ); + TransactionInfo& operator= ( const TransactionInfo& ); public: Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/WireFormatInfo.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/WireFormatInfo.cpp?rev=926754&r1=926753&r2=926754&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/WireFormatInfo.cpp (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/WireFormatInfo.cpp Tue Mar 23 19:50:25 2010 @@ -33,10 +33,7 @@ using namespace activemq::wireformat::op using namespace activemq::commands; //////////////////////////////////////////////////////////////////////////////// -WireFormatInfo::WireFormatInfo() -{ - // Init to our preferred version - this->version = 2; +WireFormatInfo::WireFormatInfo() : BaseCommand(), magic(), marshalledProperties(), properties(), version(5) { // Initialize the MAGIC buffer. magic.push_back( 'A' ); Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/XATransactionId.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/XATransactionId.cpp?rev=926754&r1=926753&r2=926754&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/XATransactionId.cpp (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/XATransactionId.cpp Tue Mar 23 19:50:25 2010 @@ -39,13 +39,15 @@ using namespace decaf::lang::exceptions; */ //////////////////////////////////////////////////////////////////////////////// -XATransactionId::XATransactionId() : TransactionId() { +XATransactionId::XATransactionId() + : TransactionId(), formatId(0), globalTransactionId(NULL), branchQualifier(NULL) { - this->formatId = 0; } //////////////////////////////////////////////////////////////////////////////// -XATransactionId::XATransactionId( const XATransactionId& other ) : TransactionId() { +XATransactionId::XATransactionId( const XATransactionId& other ) + : TransactionId(), formatId(0), globalTransactionId(NULL), branchQualifier(NULL) { + this->copyDataStructure( &other ); }
