activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r738877 [2/3] - /activemq/activemq-cpp/trunk/src/main/activemq/commands/
Date Thu, 29 Jan 2009 15:02:59 GMT
Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/FlushCommand.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/FlushCommand.cpp?rev=738877&r1=738876&r2=738877&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/FlushCommand.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/FlushCommand.cpp Thu Jan 29 15:02:56 2009
@@ -30,19 +30,19 @@
  *  Command and marshaling code for OpenWire format for FlushCommand
  *
  *
- *  NOTE!: This file is autogenerated - do not modify!
+ *  NOTE!: This file is auto generated - do not modify!
  *         if you need to make a change, please see the Java Classes in the
  *         activemq-core module
  *
  */
 ////////////////////////////////////////////////////////////////////////////////
-FlushCommand::FlushCommand()
-{
+FlushCommand::FlushCommand() {
+
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-FlushCommand::~FlushCommand()
-{
+FlushCommand::~FlushCommand() {
+
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -58,13 +58,17 @@
 ////////////////////////////////////////////////////////////////////////////////
 void FlushCommand::copyDataStructure( const DataStructure* src ) {
 
+    // Protect against invalid self assignment.
+    if( this == src ) {
+        return;
+    }
+
     // Copy the data of the base class or classes
     BaseCommand::copyDataStructure( src );
 
     const FlushCommand* srcPtr = dynamic_cast<const FlushCommand*>( src );
 
     if( srcPtr == NULL || src == NULL ) {
-
         throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
             "FlushCommand::copyDataStructure - src is NULL or invalid" );
@@ -91,6 +95,11 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 bool FlushCommand::equals( const DataStructure* value ) const {
+
+    if( this == value ) {
+        return true;
+    }
+
     const FlushCommand* valuePtr = dynamic_cast<const FlushCommand*>( value );
 
     if( valuePtr == NULL || value == NULL ) {

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/FlushCommand.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/FlushCommand.h?rev=738877&r1=738876&r2=738877&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/FlushCommand.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/FlushCommand.h Thu Jan 29 15:02:56 2009
@@ -36,7 +36,7 @@
      *  Command and marshaling code for OpenWire format for FlushCommand
      *
      *
-     *  NOTE!: This file is autogenerated - do not modify!
+     *  NOTE!: This file is auto generated - do not modify!
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      *
@@ -45,6 +45,11 @@
     protected:
 
 
+    protected:
+
+        FlushCommand( const FlushCommand& other );
+        FlushCommand& operator= ( const FlushCommand& other );
+
     public:
 
         const static unsigned char ID_FLUSHCOMMAND = 15;
@@ -56,7 +61,7 @@
 
         /**
          * Get the unique identifier that this object and its own
-         * Marshaller share.
+         * Marshaler share.
          * @returns new DataStructure type copy.
          */
         virtual unsigned char getDataStructureType() const;

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/IntegerResponse.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/IntegerResponse.cpp?rev=738877&r1=738876&r2=738877&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/IntegerResponse.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/IntegerResponse.cpp Thu Jan 29 15:02:56 2009
@@ -30,20 +30,20 @@
  *  Command and marshaling code for OpenWire format for IntegerResponse
  *
  *
- *  NOTE!: This file is autogenerated - do not modify!
+ *  NOTE!: This file is auto generated - do not modify!
  *         if you need to make a change, please see the Java Classes in the
  *         activemq-core module
  *
  */
 ////////////////////////////////////////////////////////////////////////////////
-IntegerResponse::IntegerResponse()
-{
+IntegerResponse::IntegerResponse() {
+
     this->result = 0;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-IntegerResponse::~IntegerResponse()
-{
+IntegerResponse::~IntegerResponse() {
+
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -59,13 +59,17 @@
 ////////////////////////////////////////////////////////////////////////////////
 void IntegerResponse::copyDataStructure( const DataStructure* src ) {
 
+    // Protect against invalid self assignment.
+    if( this == src ) {
+        return;
+    }
+
     // Copy the data of the base class or classes
     Response::copyDataStructure( src );
 
     const IntegerResponse* srcPtr = dynamic_cast<const IntegerResponse*>( src );
 
     if( srcPtr == NULL || src == NULL ) {
-
         throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
             "IntegerResponse::copyDataStructure - src is NULL or invalid" );
@@ -94,6 +98,11 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 bool IntegerResponse::equals( const DataStructure* value ) const {
+
+    if( this == value ) {
+        return true;
+    }
+
     const IntegerResponse* valuePtr = dynamic_cast<const IntegerResponse*>( value );
 
     if( valuePtr == NULL || value == NULL ) {
@@ -114,7 +123,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void IntegerResponse::setResult(int result ) {
+void IntegerResponse::setResult( int result ) {
     this->result = result;
 }
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/IntegerResponse.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/IntegerResponse.h?rev=738877&r1=738876&r2=738877&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/IntegerResponse.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/IntegerResponse.h Thu Jan 29 15:02:56 2009
@@ -36,7 +36,7 @@
      *  Command and marshaling code for OpenWire format for IntegerResponse
      *
      *
-     *  NOTE!: This file is autogenerated - do not modify!
+     *  NOTE!: This file is auto generated - do not modify!
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      *
@@ -46,6 +46,11 @@
 
         int result;
 
+    protected:
+
+        IntegerResponse( const IntegerResponse& other );
+        IntegerResponse& operator= ( const IntegerResponse& other );
+
     public:
 
         const static unsigned char ID_INTEGERRESPONSE = 34;
@@ -57,7 +62,7 @@
 
         /**
          * Get the unique identifier that this object and its own
-         * Marshaller share.
+         * Marshaler share.
          * @returns new DataStructure type copy.
          */
         virtual unsigned char getDataStructureType() const;

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalQueueAck.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalQueueAck.cpp?rev=738877&r1=738876&r2=738877&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalQueueAck.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalQueueAck.cpp Thu Jan 29 15:02:56 2009
@@ -30,21 +30,21 @@
  *  Command and marshaling code for OpenWire format for JournalQueueAck
  *
  *
- *  NOTE!: This file is autogenerated - do not modify!
+ *  NOTE!: This file is auto generated - do not modify!
  *         if you need to make a change, please see the Java Classes in the
  *         activemq-core module
  *
  */
 ////////////////////////////////////////////////////////////////////////////////
-JournalQueueAck::JournalQueueAck()
-{
+JournalQueueAck::JournalQueueAck() {
+
     this->destination = NULL;
     this->messageAck = NULL;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-JournalQueueAck::~JournalQueueAck()
-{
+JournalQueueAck::~JournalQueueAck() {
+
     delete this->destination;
     delete this->messageAck;
 }
@@ -62,13 +62,17 @@
 ////////////////////////////////////////////////////////////////////////////////
 void JournalQueueAck::copyDataStructure( const DataStructure* src ) {
 
+    // Protect against invalid self assignment.
+    if( this == src ) {
+        return;
+    }
+
     // Copy the data of the base class or classes
     BaseDataStructure::copyDataStructure( src );
 
     const JournalQueueAck* srcPtr = dynamic_cast<const JournalQueueAck*>( src );
 
     if( srcPtr == NULL || src == NULL ) {
-
         throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
             "JournalQueueAck::copyDataStructure - src is NULL or invalid" );
@@ -117,6 +121,11 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 bool JournalQueueAck::equals( const DataStructure* value ) const {
+
+    if( this == value ) {
+        return true;
+    }
+
     const JournalQueueAck* valuePtr = dynamic_cast<const JournalQueueAck*>( value );
 
     if( valuePtr == NULL || value == NULL ) {
@@ -153,7 +162,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void JournalQueueAck::setDestination(ActiveMQDestination* destination ) {
+void JournalQueueAck::setDestination( ActiveMQDestination* destination ) {
     this->destination = destination;
 }
 
@@ -168,7 +177,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void JournalQueueAck::setMessageAck(MessageAck* messageAck ) {
+void JournalQueueAck::setMessageAck( MessageAck* messageAck ) {
     this->messageAck = messageAck;
 }
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalQueueAck.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalQueueAck.h?rev=738877&r1=738876&r2=738877&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalQueueAck.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalQueueAck.h Thu Jan 29 15:02:56 2009
@@ -38,7 +38,7 @@
      *  Command and marshaling code for OpenWire format for JournalQueueAck
      *
      *
-     *  NOTE!: This file is autogenerated - do not modify!
+     *  NOTE!: This file is auto generated - do not modify!
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      *
@@ -49,6 +49,11 @@
         ActiveMQDestination* destination;
         MessageAck* messageAck;
 
+    protected:
+
+        JournalQueueAck( const JournalQueueAck& other );
+        JournalQueueAck& operator= ( const JournalQueueAck& other );
+
     public:
 
         const static unsigned char ID_JOURNALQUEUEACK = 52;
@@ -60,7 +65,7 @@
 
         /**
          * Get the unique identifier that this object and its own
-         * Marshaller share.
+         * Marshaler share.
          * @returns new DataStructure type copy.
          */
         virtual unsigned char getDataStructureType() const;

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTopicAck.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTopicAck.cpp?rev=738877&r1=738876&r2=738877&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTopicAck.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTopicAck.cpp Thu Jan 29 15:02:56 2009
@@ -30,14 +30,14 @@
  *  Command and marshaling code for OpenWire format for JournalTopicAck
  *
  *
- *  NOTE!: This file is autogenerated - do not modify!
+ *  NOTE!: This file is auto generated - do not modify!
  *         if you need to make a change, please see the Java Classes in the
  *         activemq-core module
  *
  */
 ////////////////////////////////////////////////////////////////////////////////
-JournalTopicAck::JournalTopicAck()
-{
+JournalTopicAck::JournalTopicAck() {
+
     this->destination = NULL;
     this->messageId = NULL;
     this->messageSequenceId = 0;
@@ -47,8 +47,8 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-JournalTopicAck::~JournalTopicAck()
-{
+JournalTopicAck::~JournalTopicAck() {
+
     delete this->destination;
     delete this->messageId;
     delete this->transactionId;
@@ -67,13 +67,17 @@
 ////////////////////////////////////////////////////////////////////////////////
 void JournalTopicAck::copyDataStructure( const DataStructure* src ) {
 
+    // Protect against invalid self assignment.
+    if( this == src ) {
+        return;
+    }
+
     // Copy the data of the base class or classes
     BaseDataStructure::copyDataStructure( src );
 
     const JournalTopicAck* srcPtr = dynamic_cast<const JournalTopicAck*>( src );
 
     if( srcPtr == NULL || src == NULL ) {
-
         throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
             "JournalTopicAck::copyDataStructure - src is NULL or invalid" );
@@ -139,6 +143,11 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 bool JournalTopicAck::equals( const DataStructure* value ) const {
+
+    if( this == value ) {
+        return true;
+    }
+
     const JournalTopicAck* valuePtr = dynamic_cast<const JournalTopicAck*>( value );
 
     if( valuePtr == NULL || value == NULL ) {
@@ -191,7 +200,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void JournalTopicAck::setDestination(ActiveMQDestination* destination ) {
+void JournalTopicAck::setDestination( ActiveMQDestination* destination ) {
     this->destination = destination;
 }
 
@@ -206,7 +215,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void JournalTopicAck::setMessageId(MessageId* messageId ) {
+void JournalTopicAck::setMessageId( MessageId* messageId ) {
     this->messageId = messageId;
 }
 
@@ -216,7 +225,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void JournalTopicAck::setMessageSequenceId(long long messageSequenceId ) {
+void JournalTopicAck::setMessageSequenceId( long long messageSequenceId ) {
     this->messageSequenceId = messageSequenceId;
 }
 
@@ -231,7 +240,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void JournalTopicAck::setSubscritionName(const std::string& subscritionName ) {
+void JournalTopicAck::setSubscritionName( const std::string& subscritionName ) {
     this->subscritionName = subscritionName;
 }
 
@@ -246,7 +255,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void JournalTopicAck::setClientId(const std::string& clientId ) {
+void JournalTopicAck::setClientId( const std::string& clientId ) {
     this->clientId = clientId;
 }
 
@@ -261,7 +270,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void JournalTopicAck::setTransactionId(TransactionId* transactionId ) {
+void JournalTopicAck::setTransactionId( TransactionId* transactionId ) {
     this->transactionId = transactionId;
 }
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTopicAck.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTopicAck.h?rev=738877&r1=738876&r2=738877&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTopicAck.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTopicAck.h Thu Jan 29 15:02:56 2009
@@ -39,7 +39,7 @@
      *  Command and marshaling code for OpenWire format for JournalTopicAck
      *
      *
-     *  NOTE!: This file is autogenerated - do not modify!
+     *  NOTE!: This file is auto generated - do not modify!
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      *
@@ -54,6 +54,11 @@
         std::string clientId;
         TransactionId* transactionId;
 
+    protected:
+
+        JournalTopicAck( const JournalTopicAck& other );
+        JournalTopicAck& operator= ( const JournalTopicAck& other );
+
     public:
 
         const static unsigned char ID_JOURNALTOPICACK = 50;
@@ -65,7 +70,7 @@
 
         /**
          * Get the unique identifier that this object and its own
-         * Marshaller share.
+         * Marshaler share.
          * @returns new DataStructure type copy.
          */
         virtual unsigned char getDataStructureType() const;

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTrace.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTrace.cpp?rev=738877&r1=738876&r2=738877&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTrace.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTrace.cpp Thu Jan 29 15:02:56 2009
@@ -30,20 +30,20 @@
  *  Command and marshaling code for OpenWire format for JournalTrace
  *
  *
- *  NOTE!: This file is autogenerated - do not modify!
+ *  NOTE!: This file is auto generated - do not modify!
  *         if you need to make a change, please see the Java Classes in the
  *         activemq-core module
  *
  */
 ////////////////////////////////////////////////////////////////////////////////
-JournalTrace::JournalTrace()
-{
+JournalTrace::JournalTrace() {
+
     this->message = "";
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-JournalTrace::~JournalTrace()
-{
+JournalTrace::~JournalTrace() {
+
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -59,13 +59,17 @@
 ////////////////////////////////////////////////////////////////////////////////
 void JournalTrace::copyDataStructure( const DataStructure* src ) {
 
+    // Protect against invalid self assignment.
+    if( this == src ) {
+        return;
+    }
+
     // Copy the data of the base class or classes
     BaseDataStructure::copyDataStructure( src );
 
     const JournalTrace* srcPtr = dynamic_cast<const JournalTrace*>( src );
 
     if( srcPtr == NULL || src == NULL ) {
-
         throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
             "JournalTrace::copyDataStructure - src is NULL or invalid" );
@@ -94,6 +98,11 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 bool JournalTrace::equals( const DataStructure* value ) const {
+
+    if( this == value ) {
+        return true;
+    }
+
     const JournalTrace* valuePtr = dynamic_cast<const JournalTrace*>( value );
 
     if( valuePtr == NULL || value == NULL ) {
@@ -119,7 +128,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void JournalTrace::setMessage(const std::string& message ) {
+void JournalTrace::setMessage( const std::string& message ) {
     this->message = message;
 }
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTrace.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTrace.h?rev=738877&r1=738876&r2=738877&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTrace.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTrace.h Thu Jan 29 15:02:56 2009
@@ -36,7 +36,7 @@
      *  Command and marshaling code for OpenWire format for JournalTrace
      *
      *
-     *  NOTE!: This file is autogenerated - do not modify!
+     *  NOTE!: This file is auto generated - do not modify!
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      *
@@ -46,6 +46,11 @@
 
         std::string message;
 
+    protected:
+
+        JournalTrace( const JournalTrace& other );
+        JournalTrace& operator= ( const JournalTrace& other );
+
     public:
 
         const static unsigned char ID_JOURNALTRACE = 53;
@@ -57,7 +62,7 @@
 
         /**
          * Get the unique identifier that this object and its own
-         * Marshaller share.
+         * Marshaler share.
          * @returns new DataStructure type copy.
          */
         virtual unsigned char getDataStructureType() const;

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTransaction.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTransaction.cpp?rev=738877&r1=738876&r2=738877&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTransaction.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTransaction.cpp Thu Jan 29 15:02:56 2009
@@ -30,22 +30,22 @@
  *  Command and marshaling code for OpenWire format for JournalTransaction
  *
  *
- *  NOTE!: This file is autogenerated - do not modify!
+ *  NOTE!: This file is auto generated - do not modify!
  *         if you need to make a change, please see the Java Classes in the
  *         activemq-core module
  *
  */
 ////////////////////////////////////////////////////////////////////////////////
-JournalTransaction::JournalTransaction()
-{
+JournalTransaction::JournalTransaction() {
+
     this->transactionId = NULL;
     this->type = 0;
     this->wasPrepared = false;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-JournalTransaction::~JournalTransaction()
-{
+JournalTransaction::~JournalTransaction() {
+
     delete this->transactionId;
 }
 
@@ -62,13 +62,17 @@
 ////////////////////////////////////////////////////////////////////////////////
 void JournalTransaction::copyDataStructure( const DataStructure* src ) {
 
+    // Protect against invalid self assignment.
+    if( this == src ) {
+        return;
+    }
+
     // Copy the data of the base class or classes
     BaseDataStructure::copyDataStructure( src );
 
     const JournalTransaction* srcPtr = dynamic_cast<const JournalTransaction*>( src );
 
     if( srcPtr == NULL || src == NULL ) {
-
         throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
             "JournalTransaction::copyDataStructure - src is NULL or invalid" );
@@ -110,6 +114,11 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 bool JournalTransaction::equals( const DataStructure* value ) const {
+
+    if( this == value ) {
+        return true;
+    }
+
     const JournalTransaction* valuePtr = dynamic_cast<const JournalTransaction*>( value );
 
     if( valuePtr == NULL || value == NULL ) {
@@ -145,7 +154,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void JournalTransaction::setTransactionId(TransactionId* transactionId ) {
+void JournalTransaction::setTransactionId( TransactionId* transactionId ) {
     this->transactionId = transactionId;
 }
 
@@ -155,7 +164,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void JournalTransaction::setType(unsigned char type ) {
+void JournalTransaction::setType( unsigned char type ) {
     this->type = type;
 }
 
@@ -165,7 +174,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void JournalTransaction::setWasPrepared(bool wasPrepared ) {
+void JournalTransaction::setWasPrepared( bool wasPrepared ) {
     this->wasPrepared = wasPrepared;
 }
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTransaction.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTransaction.h?rev=738877&r1=738876&r2=738877&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTransaction.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTransaction.h Thu Jan 29 15:02:56 2009
@@ -37,7 +37,7 @@
      *  Command and marshaling code for OpenWire format for JournalTransaction
      *
      *
-     *  NOTE!: This file is autogenerated - do not modify!
+     *  NOTE!: This file is auto generated - do not modify!
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      *
@@ -49,6 +49,11 @@
         unsigned char type;
         bool wasPrepared;
 
+    protected:
+
+        JournalTransaction( const JournalTransaction& other );
+        JournalTransaction& operator= ( const JournalTransaction& other );
+
     public:
 
         const static unsigned char ID_JOURNALTRANSACTION = 54;
@@ -60,7 +65,7 @@
 
         /**
          * Get the unique identifier that this object and its own
-         * Marshaller share.
+         * Marshaler share.
          * @returns new DataStructure type copy.
          */
         virtual unsigned char getDataStructureType() const;

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/KeepAliveInfo.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/KeepAliveInfo.cpp?rev=738877&r1=738876&r2=738877&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/KeepAliveInfo.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/KeepAliveInfo.cpp Thu Jan 29 15:02:56 2009
@@ -30,19 +30,19 @@
  *  Command and marshaling code for OpenWire format for KeepAliveInfo
  *
  *
- *  NOTE!: This file is autogenerated - do not modify!
+ *  NOTE!: This file is auto generated - do not modify!
  *         if you need to make a change, please see the Java Classes in the
  *         activemq-core module
  *
  */
 ////////////////////////////////////////////////////////////////////////////////
-KeepAliveInfo::KeepAliveInfo()
-{
+KeepAliveInfo::KeepAliveInfo() {
+
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-KeepAliveInfo::~KeepAliveInfo()
-{
+KeepAliveInfo::~KeepAliveInfo() {
+
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -58,13 +58,17 @@
 ////////////////////////////////////////////////////////////////////////////////
 void KeepAliveInfo::copyDataStructure( const DataStructure* src ) {
 
+    // Protect against invalid self assignment.
+    if( this == src ) {
+        return;
+    }
+
     // Copy the data of the base class or classes
     BaseCommand::copyDataStructure( src );
 
     const KeepAliveInfo* srcPtr = dynamic_cast<const KeepAliveInfo*>( src );
 
     if( srcPtr == NULL || src == NULL ) {
-
         throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
             "KeepAliveInfo::copyDataStructure - src is NULL or invalid" );
@@ -91,6 +95,11 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 bool KeepAliveInfo::equals( const DataStructure* value ) const {
+
+    if( this == value ) {
+        return true;
+    }
+
     const KeepAliveInfo* valuePtr = dynamic_cast<const KeepAliveInfo*>( value );
 
     if( valuePtr == NULL || value == NULL ) {

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/KeepAliveInfo.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/KeepAliveInfo.h?rev=738877&r1=738876&r2=738877&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/KeepAliveInfo.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/KeepAliveInfo.h Thu Jan 29 15:02:56 2009
@@ -36,7 +36,7 @@
      *  Command and marshaling code for OpenWire format for KeepAliveInfo
      *
      *
-     *  NOTE!: This file is autogenerated - do not modify!
+     *  NOTE!: This file is auto generated - do not modify!
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      *
@@ -45,6 +45,11 @@
     protected:
 
 
+    protected:
+
+        KeepAliveInfo( const KeepAliveInfo& other );
+        KeepAliveInfo& operator= ( const KeepAliveInfo& other );
+
     public:
 
         const static unsigned char ID_KEEPALIVEINFO = 10;
@@ -56,7 +61,7 @@
 
         /**
          * Get the unique identifier that this object and its own
-         * Marshaller share.
+         * Marshaler share.
          * @returns new DataStructure type copy.
          */
         virtual unsigned char getDataStructureType() const;

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/LastPartialCommand.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/LastPartialCommand.cpp?rev=738877&r1=738876&r2=738877&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/LastPartialCommand.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/LastPartialCommand.cpp Thu Jan 29 15:02:56 2009
@@ -30,19 +30,19 @@
  *  Command and marshaling code for OpenWire format for LastPartialCommand
  *
  *
- *  NOTE!: This file is autogenerated - do not modify!
+ *  NOTE!: This file is auto generated - do not modify!
  *         if you need to make a change, please see the Java Classes in the
  *         activemq-core module
  *
  */
 ////////////////////////////////////////////////////////////////////////////////
-LastPartialCommand::LastPartialCommand()
-{
+LastPartialCommand::LastPartialCommand() {
+
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-LastPartialCommand::~LastPartialCommand()
-{
+LastPartialCommand::~LastPartialCommand() {
+
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -58,13 +58,17 @@
 ////////////////////////////////////////////////////////////////////////////////
 void LastPartialCommand::copyDataStructure( const DataStructure* src ) {
 
+    // Protect against invalid self assignment.
+    if( this == src ) {
+        return;
+    }
+
     // Copy the data of the base class or classes
     PartialCommand::copyDataStructure( src );
 
     const LastPartialCommand* srcPtr = dynamic_cast<const LastPartialCommand*>( src );
 
     if( srcPtr == NULL || src == NULL ) {
-
         throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
             "LastPartialCommand::copyDataStructure - src is NULL or invalid" );
@@ -91,6 +95,11 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 bool LastPartialCommand::equals( const DataStructure* value ) const {
+
+    if( this == value ) {
+        return true;
+    }
+
     const LastPartialCommand* valuePtr = dynamic_cast<const LastPartialCommand*>( value );
 
     if( valuePtr == NULL || value == NULL ) {

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/LastPartialCommand.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/LastPartialCommand.h?rev=738877&r1=738876&r2=738877&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/LastPartialCommand.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/LastPartialCommand.h Thu Jan 29 15:02:56 2009
@@ -36,7 +36,7 @@
      *  Command and marshaling code for OpenWire format for LastPartialCommand
      *
      *
-     *  NOTE!: This file is autogenerated - do not modify!
+     *  NOTE!: This file is auto generated - do not modify!
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      *
@@ -45,6 +45,11 @@
     protected:
 
 
+    protected:
+
+        LastPartialCommand( const LastPartialCommand& other );
+        LastPartialCommand& operator= ( const LastPartialCommand& other );
+
     public:
 
         const static unsigned char ID_LASTPARTIALCOMMAND = 61;
@@ -56,7 +61,7 @@
 
         /**
          * Get the unique identifier that this object and its own
-         * Marshaller share.
+         * Marshaler share.
          * @returns new DataStructure type copy.
          */
         virtual unsigned char getDataStructureType() const;

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/LocalTransactionId.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/LocalTransactionId.cpp?rev=738877&r1=738876&r2=738877&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/LocalTransactionId.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/LocalTransactionId.cpp Thu Jan 29 15:02:56 2009
@@ -18,6 +18,7 @@
 #include <activemq/state/CommandVisitor.h>
 #include <activemq/exceptions/ActiveMQException.h>
 #include <decaf/lang/exceptions/NullPointerException.h>
+#include <apr_strings.h>
 
 using namespace std;
 using namespace activemq;
@@ -30,21 +31,26 @@
  *  Command and marshaling code for OpenWire format for LocalTransactionId
  *
  *
- *  NOTE!: This file is autogenerated - do not modify!
+ *  NOTE!: This file is auto generated - do not modify!
  *         if you need to make a change, please see the Java Classes in the
  *         activemq-core module
  *
  */
 ////////////////////////////////////////////////////////////////////////////////
-LocalTransactionId::LocalTransactionId()
-{
+LocalTransactionId::LocalTransactionId() {
+
     this->value = 0;
     this->connectionId = NULL;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-LocalTransactionId::~LocalTransactionId()
-{
+LocalTransactionId::LocalTransactionId( const LocalTransactionId& other ) {
+    this->copyDataStructure( &other );
+}
+
+////////////////////////////////////////////////////////////////////////////////
+LocalTransactionId::~LocalTransactionId() {
+
     delete this->connectionId;
 }
 
@@ -61,13 +67,17 @@
 ////////////////////////////////////////////////////////////////////////////////
 void LocalTransactionId::copyDataStructure( const DataStructure* src ) {
 
+    // Protect against invalid self assignment.
+    if( this == src ) {
+        return;
+    }
+
     // Copy the data of the base class or classes
     TransactionId::copyDataStructure( src );
 
     const LocalTransactionId* srcPtr = dynamic_cast<const LocalTransactionId*>( src );
 
     if( srcPtr == NULL || src == NULL ) {
-
         throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
             "LocalTransactionId::copyDataStructure - src is NULL or invalid" );
@@ -107,6 +117,11 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 bool LocalTransactionId::equals( const DataStructure* value ) const {
+
+    if( this == value ) {
+        return true;
+    }
+
     const LocalTransactionId* valuePtr = dynamic_cast<const LocalTransactionId*>( value );
 
     if( valuePtr == NULL || value == NULL ) {
@@ -134,7 +149,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void LocalTransactionId::setValue(long long value ) {
+void LocalTransactionId::setValue( long long value ) {
     this->value = value;
 }
 
@@ -149,7 +164,47 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void LocalTransactionId::setConnectionId(ConnectionId* connectionId ) {
+void LocalTransactionId::setConnectionId( ConnectionId* connectionId ) {
     this->connectionId = connectionId;
 }
 
+////////////////////////////////////////////////////////////////////////////////
+int LocalTransactionId::compareTo( const LocalTransactionId& value ) const {
+
+    if( this == &value ) {
+        return 0;
+    }
+
+    if( this->value > value.value ) {
+        return 1;
+    } else if( this->value < value.value ) {
+        return -1;
+    }
+
+    int connectionIdComp = this->connectionId->compareTo( *( value.connectionId ) );
+    if( connectionIdComp != 0 ) {
+        return connectionIdComp;
+    }
+
+    return 0;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+bool LocalTransactionId::equals( const LocalTransactionId& value ) const {
+    return this->equals( &value );
+}
+
+////////////////////////////////////////////////////////////////////////////////
+bool LocalTransactionId::operator==( const LocalTransactionId& value ) const {
+    return this->compareTo( value ) == 0;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+bool LocalTransactionId::operator<( const LocalTransactionId& value ) const {
+    return this->compareTo( value ) < 0;
+}
+////////////////////////////////////////////////////////////////////////////////
+LocalTransactionId& LocalTransactionId::operator= ( const LocalTransactionId& other ) {
+    this->copyDataStructure( &other );
+}
+

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/LocalTransactionId.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/LocalTransactionId.h?rev=738877&r1=738876&r2=738877&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/LocalTransactionId.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/LocalTransactionId.h Thu Jan 29 15:02:56 2009
@@ -25,6 +25,7 @@
 
 #include <activemq/util/Config.h>
 #include <activemq/commands/TransactionId.h>
+#include <decaf/lang/Comparable.h>
 #include <activemq/commands/ConnectionId.h>
 #include <vector>
 #include <string>
@@ -37,12 +38,12 @@
      *  Command and marshaling code for OpenWire format for LocalTransactionId
      *
      *
-     *  NOTE!: This file is autogenerated - do not modify!
+     *  NOTE!: This file is auto generated - do not modify!
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      *
      */
-    class AMQCPP_API LocalTransactionId : public TransactionId {
+    class AMQCPP_API LocalTransactionId : public TransactionId, public decaf::lang::Comparable<LocalTransactionId> {
     protected:
 
         long long value;
@@ -55,11 +56,12 @@
     public:
 
         LocalTransactionId();
+        LocalTransactionId( const LocalTransactionId& other );
         virtual ~LocalTransactionId();
 
         /**
          * Get the unique identifier that this object and its own
-         * Marshaller share.
+         * Marshaler share.
          * @returns new DataStructure type copy.
          */
         virtual unsigned char getDataStructureType() const;
@@ -100,6 +102,15 @@
         virtual ConnectionId* getConnectionId();
         virtual void setConnectionId( ConnectionId* connectionId );
 
+        virtual int compareTo( const LocalTransactionId& value ) const;
+
+        virtual bool equals( const LocalTransactionId& value ) const;
+
+        virtual bool operator==( const LocalTransactionId& value ) const;
+
+        virtual bool operator<( const LocalTransactionId& value ) const;
+
+        LocalTransactionId& operator= ( const LocalTransactionId& other );
     };
 
 }}

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/Message.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/Message.cpp?rev=738877&r1=738876&r2=738877&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/Message.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/Message.cpp Thu Jan 29 15:02:56 2009
@@ -30,14 +30,14 @@
  *  Command and marshaling code for OpenWire format for Message
  *
  *
- *  NOTE!: This file is autogenerated - do not modify!
+ *  NOTE!: This file is auto generated - do not modify!
  *         if you need to make a change, please see the Java Classes in the
  *         activemq-core module
  *
  */
 ////////////////////////////////////////////////////////////////////////////////
-Message::Message()
-{
+Message::Message() {
+
     this->producerId = NULL;
     this->destination = NULL;
     this->transactionId = NULL;
@@ -66,8 +66,8 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-Message::~Message()
-{
+Message::~Message() {
+
     delete this->producerId;
     delete this->destination;
     delete this->transactionId;
@@ -98,13 +98,17 @@
 ////////////////////////////////////////////////////////////////////////////////
 void Message::copyDataStructure( const DataStructure* src ) {
 
+    // Protect against invalid self assignment.
+    if( this == src ) {
+        return;
+    }
+
     // Copy the data of the base class or classes
     BaseCommand::copyDataStructure( src );
 
     const Message* srcPtr = dynamic_cast<const Message*>( src );
 
     if( srcPtr == NULL || src == NULL ) {
-
         throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
             "Message::copyDataStructure - src is NULL or invalid" );
@@ -304,6 +308,11 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 bool Message::equals( const DataStructure* value ) const {
+
+    if( this == value ) {
+        return true;
+    }
+
     const Message* valuePtr = dynamic_cast<const Message*>( value );
 
     if( valuePtr == NULL || value == NULL ) {
@@ -483,7 +492,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void Message::setProducerId(ProducerId* producerId ) {
+void Message::setProducerId( ProducerId* producerId ) {
     this->producerId = producerId;
 }
 
@@ -498,7 +507,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void Message::setDestination(ActiveMQDestination* destination ) {
+void Message::setDestination( ActiveMQDestination* destination ) {
     this->destination = destination;
 }
 
@@ -513,7 +522,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void Message::setTransactionId(TransactionId* transactionId ) {
+void Message::setTransactionId( TransactionId* transactionId ) {
     this->transactionId = transactionId;
 }
 
@@ -528,7 +537,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void Message::setOriginalDestination(ActiveMQDestination* originalDestination ) {
+void Message::setOriginalDestination( ActiveMQDestination* originalDestination ) {
     this->originalDestination = originalDestination;
 }
 
@@ -543,7 +552,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void Message::setMessageId(MessageId* messageId ) {
+void Message::setMessageId( MessageId* messageId ) {
     this->messageId = messageId;
 }
 
@@ -558,7 +567,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void Message::setOriginalTransactionId(TransactionId* originalTransactionId ) {
+void Message::setOriginalTransactionId( TransactionId* originalTransactionId ) {
     this->originalTransactionId = originalTransactionId;
 }
 
@@ -573,7 +582,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void Message::setGroupID(const std::string& groupID ) {
+void Message::setGroupID( const std::string& groupID ) {
     this->groupID = groupID;
 }
 
@@ -583,7 +592,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void Message::setGroupSequence(int groupSequence ) {
+void Message::setGroupSequence( int groupSequence ) {
     this->groupSequence = groupSequence;
 }
 
@@ -598,7 +607,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void Message::setCorrelationId(const std::string& correlationId ) {
+void Message::setCorrelationId( const std::string& correlationId ) {
     this->correlationId = correlationId;
 }
 
@@ -608,7 +617,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void Message::setPersistent(bool persistent ) {
+void Message::setPersistent( bool persistent ) {
     this->persistent = persistent;
 }
 
@@ -618,7 +627,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void Message::setExpiration(long long expiration ) {
+void Message::setExpiration( long long expiration ) {
     this->expiration = expiration;
 }
 
@@ -628,7 +637,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void Message::setPriority(unsigned char priority ) {
+void Message::setPriority( unsigned char priority ) {
     this->priority = priority;
 }
 
@@ -643,7 +652,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void Message::setReplyTo(ActiveMQDestination* replyTo ) {
+void Message::setReplyTo( ActiveMQDestination* replyTo ) {
     this->replyTo = replyTo;
 }
 
@@ -653,7 +662,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void Message::setTimestamp(long long timestamp ) {
+void Message::setTimestamp( long long timestamp ) {
     this->timestamp = timestamp;
 }
 
@@ -668,7 +677,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void Message::setType(const std::string& type ) {
+void Message::setType( const std::string& type ) {
     this->type = type;
 }
 
@@ -683,7 +692,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void Message::setContent(const std::vector<unsigned char>& content ) {
+void Message::setContent( const std::vector<unsigned char>& content ) {
     this->content = content;
 }
 
@@ -698,7 +707,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void Message::setMarshalledProperties(const std::vector<unsigned char>& marshalledProperties ) {
+void Message::setMarshalledProperties( const std::vector<unsigned char>& marshalledProperties ) {
     this->marshalledProperties = marshalledProperties;
 }
 
@@ -713,7 +722,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void Message::setDataStructure(DataStructure* dataStructure ) {
+void Message::setDataStructure( DataStructure* dataStructure ) {
     this->dataStructure = dataStructure;
 }
 
@@ -728,7 +737,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void Message::setTargetConsumerId(ConsumerId* targetConsumerId ) {
+void Message::setTargetConsumerId( ConsumerId* targetConsumerId ) {
     this->targetConsumerId = targetConsumerId;
 }
 
@@ -738,7 +747,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void Message::setCompressed(bool compressed ) {
+void Message::setCompressed( bool compressed ) {
     this->compressed = compressed;
 }
 
@@ -748,7 +757,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void Message::setRedeliveryCounter(int redeliveryCounter ) {
+void Message::setRedeliveryCounter( int redeliveryCounter ) {
     this->redeliveryCounter = redeliveryCounter;
 }
 
@@ -763,7 +772,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void Message::setBrokerPath(const std::vector<BrokerId*>& brokerPath ) {
+void Message::setBrokerPath( const std::vector<BrokerId*>& brokerPath ) {
     this->brokerPath = brokerPath;
 }
 
@@ -773,7 +782,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void Message::setArrival(long long arrival ) {
+void Message::setArrival( long long arrival ) {
     this->arrival = arrival;
 }
 
@@ -788,7 +797,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void Message::setUserID(const std::string& userID ) {
+void Message::setUserID( const std::string& userID ) {
     this->userID = userID;
 }
 
@@ -798,7 +807,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void Message::setRecievedByDFBridge(bool recievedByDFBridge ) {
+void Message::setRecievedByDFBridge( bool recievedByDFBridge ) {
     this->recievedByDFBridge = recievedByDFBridge;
 }
 
@@ -808,7 +817,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void Message::setDroppable(bool droppable ) {
+void Message::setDroppable( bool droppable ) {
     this->droppable = droppable;
 }
 
@@ -823,7 +832,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void Message::setCluster(const std::vector<BrokerId*>& cluster ) {
+void Message::setCluster( const std::vector<BrokerId*>& cluster ) {
     this->cluster = cluster;
 }
 
@@ -833,7 +842,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void Message::setBrokerInTime(long long brokerInTime ) {
+void Message::setBrokerInTime( long long brokerInTime ) {
     this->brokerInTime = brokerInTime;
 }
 
@@ -843,7 +852,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void Message::setBrokerOutTime(long long brokerOutTime ) {
+void Message::setBrokerOutTime( long long brokerOutTime ) {
     this->brokerOutTime = brokerOutTime;
 }
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/Message.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/Message.h?rev=738877&r1=738876&r2=738877&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/Message.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/Message.h Thu Jan 29 15:02:56 2009
@@ -47,7 +47,7 @@
      *  Command and marshaling code for OpenWire format for Message
      *
      *
-     *  NOTE!: This file is autogenerated - do not modify!
+     *  NOTE!: This file is auto generated - do not modify!
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      *
@@ -87,6 +87,11 @@
         long long brokerInTime;
         long long brokerOutTime;
 
+    protected:
+
+        Message( const Message& other );
+        Message& operator= ( const Message& other );
+
     public:
 
         const static unsigned char ID_MESSAGE = 0;
@@ -98,7 +103,7 @@
 
         /**
          * Get the unique identifier that this object and its own
-         * Marshaller share.
+         * Marshaler share.
          * @returns new DataStructure type copy.
          */
         virtual unsigned char getDataStructureType() const;

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageAck.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageAck.cpp?rev=738877&r1=738876&r2=738877&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageAck.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageAck.cpp Thu Jan 29 15:02:56 2009
@@ -30,14 +30,14 @@
  *  Command and marshaling code for OpenWire format for MessageAck
  *
  *
- *  NOTE!: This file is autogenerated - do not modify!
+ *  NOTE!: This file is auto generated - do not modify!
  *         if you need to make a change, please see the Java Classes in the
  *         activemq-core module
  *
  */
 ////////////////////////////////////////////////////////////////////////////////
-MessageAck::MessageAck()
-{
+MessageAck::MessageAck() {
+
     this->destination = NULL;
     this->transactionId = NULL;
     this->consumerId = NULL;
@@ -48,8 +48,8 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-MessageAck::~MessageAck()
-{
+MessageAck::~MessageAck() {
+
     delete this->destination;
     delete this->transactionId;
     delete this->consumerId;
@@ -70,13 +70,17 @@
 ////////////////////////////////////////////////////////////////////////////////
 void MessageAck::copyDataStructure( const DataStructure* src ) {
 
+    // Protect against invalid self assignment.
+    if( this == src ) {
+        return;
+    }
+
     // Copy the data of the base class or classes
     BaseCommand::copyDataStructure( src );
 
     const MessageAck* srcPtr = dynamic_cast<const MessageAck*>( src );
 
     if( srcPtr == NULL || src == NULL ) {
-
         throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
             "MessageAck::copyDataStructure - src is NULL or invalid" );
@@ -162,6 +166,11 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 bool MessageAck::equals( const DataStructure* value ) const {
+
+    if( this == value ) {
+        return true;
+    }
+
     const MessageAck* valuePtr = dynamic_cast<const MessageAck*>( value );
 
     if( valuePtr == NULL || value == NULL ) {
@@ -232,7 +241,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void MessageAck::setDestination(ActiveMQDestination* destination ) {
+void MessageAck::setDestination( ActiveMQDestination* destination ) {
     this->destination = destination;
 }
 
@@ -247,7 +256,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void MessageAck::setTransactionId(TransactionId* transactionId ) {
+void MessageAck::setTransactionId( TransactionId* transactionId ) {
     this->transactionId = transactionId;
 }
 
@@ -262,7 +271,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void MessageAck::setConsumerId(ConsumerId* consumerId ) {
+void MessageAck::setConsumerId( ConsumerId* consumerId ) {
     this->consumerId = consumerId;
 }
 
@@ -272,7 +281,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void MessageAck::setAckType(unsigned char ackType ) {
+void MessageAck::setAckType( unsigned char ackType ) {
     this->ackType = ackType;
 }
 
@@ -287,7 +296,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void MessageAck::setFirstMessageId(MessageId* firstMessageId ) {
+void MessageAck::setFirstMessageId( MessageId* firstMessageId ) {
     this->firstMessageId = firstMessageId;
 }
 
@@ -302,7 +311,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void MessageAck::setLastMessageId(MessageId* lastMessageId ) {
+void MessageAck::setLastMessageId( MessageId* lastMessageId ) {
     this->lastMessageId = lastMessageId;
 }
 
@@ -312,7 +321,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void MessageAck::setMessageCount(int messageCount ) {
+void MessageAck::setMessageCount( int messageCount ) {
     this->messageCount = messageCount;
 }
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageAck.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageAck.h?rev=738877&r1=738876&r2=738877&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageAck.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageAck.h Thu Jan 29 15:02:56 2009
@@ -41,7 +41,7 @@
      *  Command and marshaling code for OpenWire format for MessageAck
      *
      *
-     *  NOTE!: This file is autogenerated - do not modify!
+     *  NOTE!: This file is auto generated - do not modify!
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      *
@@ -57,6 +57,11 @@
         MessageId* lastMessageId;
         int messageCount;
 
+    protected:
+
+        MessageAck( const MessageAck& other );
+        MessageAck& operator= ( const MessageAck& other );
+
     public:
 
         const static unsigned char ID_MESSAGEACK = 22;
@@ -68,7 +73,7 @@
 
         /**
          * Get the unique identifier that this object and its own
-         * Marshaller share.
+         * Marshaler share.
          * @returns new DataStructure type copy.
          */
         virtual unsigned char getDataStructureType() const;

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageDispatch.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageDispatch.cpp?rev=738877&r1=738876&r2=738877&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageDispatch.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageDispatch.cpp Thu Jan 29 15:02:56 2009
@@ -30,14 +30,14 @@
  *  Command and marshaling code for OpenWire format for MessageDispatch
  *
  *
- *  NOTE!: This file is autogenerated - do not modify!
+ *  NOTE!: This file is auto generated - do not modify!
  *         if you need to make a change, please see the Java Classes in the
  *         activemq-core module
  *
  */
 ////////////////////////////////////////////////////////////////////////////////
-MessageDispatch::MessageDispatch()
-{
+MessageDispatch::MessageDispatch() {
+
     this->consumerId = NULL;
     this->destination = NULL;
     this->message = NULL;
@@ -45,8 +45,8 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-MessageDispatch::~MessageDispatch()
-{
+MessageDispatch::~MessageDispatch() {
+
     delete this->consumerId;
     delete this->destination;
     delete this->message;
@@ -65,13 +65,17 @@
 ////////////////////////////////////////////////////////////////////////////////
 void MessageDispatch::copyDataStructure( const DataStructure* src ) {
 
+    // Protect against invalid self assignment.
+    if( this == src ) {
+        return;
+    }
+
     // Copy the data of the base class or classes
     BaseCommand::copyDataStructure( src );
 
     const MessageDispatch* srcPtr = dynamic_cast<const MessageDispatch*>( src );
 
     if( srcPtr == NULL || src == NULL ) {
-
         throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
             "MessageDispatch::copyDataStructure - src is NULL or invalid" );
@@ -133,6 +137,11 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 bool MessageDispatch::equals( const DataStructure* value ) const {
+
+    if( this == value ) {
+        return true;
+    }
+
     const MessageDispatch* valuePtr = dynamic_cast<const MessageDispatch*>( value );
 
     if( valuePtr == NULL || value == NULL ) {
@@ -186,7 +195,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void MessageDispatch::setConsumerId(ConsumerId* consumerId ) {
+void MessageDispatch::setConsumerId( ConsumerId* consumerId ) {
     this->consumerId = consumerId;
 }
 
@@ -201,7 +210,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void MessageDispatch::setDestination(ActiveMQDestination* destination ) {
+void MessageDispatch::setDestination( ActiveMQDestination* destination ) {
     this->destination = destination;
 }
 
@@ -216,7 +225,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void MessageDispatch::setMessage(Message* message ) {
+void MessageDispatch::setMessage( Message* message ) {
     this->message = message;
 }
 
@@ -226,7 +235,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void MessageDispatch::setRedeliveryCounter(int redeliveryCounter ) {
+void MessageDispatch::setRedeliveryCounter( int redeliveryCounter ) {
     this->redeliveryCounter = redeliveryCounter;
 }
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageDispatch.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageDispatch.h?rev=738877&r1=738876&r2=738877&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageDispatch.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageDispatch.h Thu Jan 29 15:02:56 2009
@@ -39,7 +39,7 @@
      *  Command and marshaling code for OpenWire format for MessageDispatch
      *
      *
-     *  NOTE!: This file is autogenerated - do not modify!
+     *  NOTE!: This file is auto generated - do not modify!
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      *
@@ -52,6 +52,11 @@
         Message* message;
         int redeliveryCounter;
 
+    protected:
+
+        MessageDispatch( const MessageDispatch& other );
+        MessageDispatch& operator= ( const MessageDispatch& other );
+
     public:
 
         const static unsigned char ID_MESSAGEDISPATCH = 21;
@@ -63,7 +68,7 @@
 
         /**
          * Get the unique identifier that this object and its own
-         * Marshaller share.
+         * Marshaler share.
          * @returns new DataStructure type copy.
          */
         virtual unsigned char getDataStructureType() const;

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageDispatchNotification.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageDispatchNotification.cpp?rev=738877&r1=738876&r2=738877&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageDispatchNotification.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageDispatchNotification.cpp Thu Jan 29 15:02:56 2009
@@ -30,14 +30,14 @@
  *  Command and marshaling code for OpenWire format for MessageDispatchNotification
  *
  *
- *  NOTE!: This file is autogenerated - do not modify!
+ *  NOTE!: This file is auto generated - do not modify!
  *         if you need to make a change, please see the Java Classes in the
  *         activemq-core module
  *
  */
 ////////////////////////////////////////////////////////////////////////////////
-MessageDispatchNotification::MessageDispatchNotification()
-{
+MessageDispatchNotification::MessageDispatchNotification() {
+
     this->consumerId = NULL;
     this->destination = NULL;
     this->deliverySequenceId = 0;
@@ -45,8 +45,8 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-MessageDispatchNotification::~MessageDispatchNotification()
-{
+MessageDispatchNotification::~MessageDispatchNotification() {
+
     delete this->consumerId;
     delete this->destination;
     delete this->messageId;
@@ -65,13 +65,17 @@
 ////////////////////////////////////////////////////////////////////////////////
 void MessageDispatchNotification::copyDataStructure( const DataStructure* src ) {
 
+    // Protect against invalid self assignment.
+    if( this == src ) {
+        return;
+    }
+
     // Copy the data of the base class or classes
     BaseCommand::copyDataStructure( src );
 
     const MessageDispatchNotification* srcPtr = dynamic_cast<const MessageDispatchNotification*>( src );
 
     if( srcPtr == NULL || src == NULL ) {
-
         throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
             "MessageDispatchNotification::copyDataStructure - src is NULL or invalid" );
@@ -133,6 +137,11 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 bool MessageDispatchNotification::equals( const DataStructure* value ) const {
+
+    if( this == value ) {
+        return true;
+    }
+
     const MessageDispatchNotification* valuePtr = dynamic_cast<const MessageDispatchNotification*>( value );
 
     if( valuePtr == NULL || value == NULL ) {
@@ -186,7 +195,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void MessageDispatchNotification::setConsumerId(ConsumerId* consumerId ) {
+void MessageDispatchNotification::setConsumerId( ConsumerId* consumerId ) {
     this->consumerId = consumerId;
 }
 
@@ -201,7 +210,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void MessageDispatchNotification::setDestination(ActiveMQDestination* destination ) {
+void MessageDispatchNotification::setDestination( ActiveMQDestination* destination ) {
     this->destination = destination;
 }
 
@@ -211,7 +220,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void MessageDispatchNotification::setDeliverySequenceId(long long deliverySequenceId ) {
+void MessageDispatchNotification::setDeliverySequenceId( long long deliverySequenceId ) {
     this->deliverySequenceId = deliverySequenceId;
 }
 
@@ -226,7 +235,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void MessageDispatchNotification::setMessageId(MessageId* messageId ) {
+void MessageDispatchNotification::setMessageId( MessageId* messageId ) {
     this->messageId = messageId;
 }
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageDispatchNotification.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageDispatchNotification.h?rev=738877&r1=738876&r2=738877&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageDispatchNotification.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageDispatchNotification.h Thu Jan 29 15:02:56 2009
@@ -39,7 +39,7 @@
      *  Command and marshaling code for OpenWire format for MessageDispatchNotification
      *
      *
-     *  NOTE!: This file is autogenerated - do not modify!
+     *  NOTE!: This file is auto generated - do not modify!
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      *
@@ -52,6 +52,11 @@
         long long deliverySequenceId;
         MessageId* messageId;
 
+    protected:
+
+        MessageDispatchNotification( const MessageDispatchNotification& other );
+        MessageDispatchNotification& operator= ( const MessageDispatchNotification& other );
+
     public:
 
         const static unsigned char ID_MESSAGEDISPATCHNOTIFICATION = 90;
@@ -63,7 +68,7 @@
 
         /**
          * Get the unique identifier that this object and its own
-         * Marshaller share.
+         * Marshaler share.
          * @returns new DataStructure type copy.
          */
         virtual unsigned char getDataStructureType() const;

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageId.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageId.cpp?rev=738877&r1=738876&r2=738877&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageId.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageId.cpp Thu Jan 29 15:02:56 2009
@@ -18,6 +18,7 @@
 #include <activemq/state/CommandVisitor.h>
 #include <activemq/exceptions/ActiveMQException.h>
 #include <decaf/lang/exceptions/NullPointerException.h>
+#include <apr_strings.h>
 
 using namespace std;
 using namespace activemq;
@@ -30,22 +31,27 @@
  *  Command and marshaling code for OpenWire format for MessageId
  *
  *
- *  NOTE!: This file is autogenerated - do not modify!
+ *  NOTE!: This file is auto generated - do not modify!
  *         if you need to make a change, please see the Java Classes in the
  *         activemq-core module
  *
  */
 ////////////////////////////////////////////////////////////////////////////////
-MessageId::MessageId()
-{
+MessageId::MessageId() {
+
     this->producerId = NULL;
     this->producerSequenceId = 0;
     this->brokerSequenceId = 0;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-MessageId::~MessageId()
-{
+MessageId::MessageId( const MessageId& other ) {
+    this->copyDataStructure( &other );
+}
+
+////////////////////////////////////////////////////////////////////////////////
+MessageId::~MessageId() {
+
     delete this->producerId;
 }
 
@@ -62,13 +68,17 @@
 ////////////////////////////////////////////////////////////////////////////////
 void MessageId::copyDataStructure( const DataStructure* src ) {
 
+    // Protect against invalid self assignment.
+    if( this == src ) {
+        return;
+    }
+
     // Copy the data of the base class or classes
     BaseDataStructure::copyDataStructure( src );
 
     const MessageId* srcPtr = dynamic_cast<const MessageId*>( src );
 
     if( srcPtr == NULL || src == NULL ) {
-
         throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
             "MessageId::copyDataStructure - src is NULL or invalid" );
@@ -110,6 +120,11 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 bool MessageId::equals( const DataStructure* value ) const {
+
+    if( this == value ) {
+        return true;
+    }
+
     const MessageId* valuePtr = dynamic_cast<const MessageId*>( value );
 
     if( valuePtr == NULL || value == NULL ) {
@@ -145,7 +160,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void MessageId::setProducerId(ProducerId* producerId ) {
+void MessageId::setProducerId( ProducerId* producerId ) {
     this->producerId = producerId;
 }
 
@@ -155,7 +170,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void MessageId::setProducerSequenceId(long long producerSequenceId ) {
+void MessageId::setProducerSequenceId( long long producerSequenceId ) {
     this->producerSequenceId = producerSequenceId;
 }
 
@@ -165,7 +180,53 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void MessageId::setBrokerSequenceId(long long brokerSequenceId ) {
+void MessageId::setBrokerSequenceId( long long brokerSequenceId ) {
     this->brokerSequenceId = brokerSequenceId;
 }
 
+////////////////////////////////////////////////////////////////////////////////
+int MessageId::compareTo( const MessageId& value ) const {
+
+    if( this == &value ) {
+        return 0;
+    }
+
+    int producerIdComp = this->producerId->compareTo( *( value.producerId ) );
+    if( producerIdComp != 0 ) {
+        return producerIdComp;
+    }
+
+    if( this->producerSequenceId > value.producerSequenceId ) {
+        return 1;
+    } else if( this->producerSequenceId < value.producerSequenceId ) {
+        return -1;
+    }
+
+    if( this->brokerSequenceId > value.brokerSequenceId ) {
+        return 1;
+    } else if( this->brokerSequenceId < value.brokerSequenceId ) {
+        return -1;
+    }
+
+    return 0;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+bool MessageId::equals( const MessageId& value ) const {
+    return this->equals( &value );
+}
+
+////////////////////////////////////////////////////////////////////////////////
+bool MessageId::operator==( const MessageId& value ) const {
+    return this->compareTo( value ) == 0;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+bool MessageId::operator<( const MessageId& value ) const {
+    return this->compareTo( value ) < 0;
+}
+////////////////////////////////////////////////////////////////////////////////
+MessageId& MessageId::operator= ( const MessageId& other ) {
+    this->copyDataStructure( &other );
+}
+

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageId.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageId.h?rev=738877&r1=738876&r2=738877&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageId.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageId.h Thu Jan 29 15:02:56 2009
@@ -25,6 +25,7 @@
 
 #include <activemq/util/Config.h>
 #include <activemq/commands/BaseDataStructure.h>
+#include <decaf/lang/Comparable.h>
 #include <activemq/commands/ProducerId.h>
 #include <vector>
 #include <string>
@@ -37,12 +38,12 @@
      *  Command and marshaling code for OpenWire format for MessageId
      *
      *
-     *  NOTE!: This file is autogenerated - do not modify!
+     *  NOTE!: This file is auto generated - do not modify!
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      *
      */
-    class AMQCPP_API MessageId : public BaseDataStructure {
+    class AMQCPP_API MessageId : public BaseDataStructure, public decaf::lang::Comparable<MessageId> {
     protected:
 
         ProducerId* producerId;
@@ -56,11 +57,12 @@
     public:
 
         MessageId();
+        MessageId( const MessageId& other );
         virtual ~MessageId();
 
         /**
          * Get the unique identifier that this object and its own
-         * Marshaller share.
+         * Marshaler share.
          * @returns new DataStructure type copy.
          */
         virtual unsigned char getDataStructureType() const;
@@ -104,6 +106,15 @@
         virtual long long getBrokerSequenceId() const;
         virtual void setBrokerSequenceId( long long brokerSequenceId );
 
+        virtual int compareTo( const MessageId& value ) const;
+
+        virtual bool equals( const MessageId& value ) const;
+
+        virtual bool operator==( const MessageId& value ) const;
+
+        virtual bool operator<( const MessageId& value ) const;
+
+        MessageId& operator= ( const MessageId& other );
     };
 
 }}

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/MessagePull.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/MessagePull.cpp?rev=738877&r1=738876&r2=738877&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/MessagePull.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/MessagePull.cpp Thu Jan 29 15:02:56 2009
@@ -30,14 +30,14 @@
  *  Command and marshaling code for OpenWire format for MessagePull
  *
  *
- *  NOTE!: This file is autogenerated - do not modify!
+ *  NOTE!: This file is auto generated - do not modify!
  *         if you need to make a change, please see the Java Classes in the
  *         activemq-core module
  *
  */
 ////////////////////////////////////////////////////////////////////////////////
-MessagePull::MessagePull()
-{
+MessagePull::MessagePull() {
+
     this->consumerId = NULL;
     this->destination = NULL;
     this->timeout = 0;
@@ -46,8 +46,8 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-MessagePull::~MessagePull()
-{
+MessagePull::~MessagePull() {
+
     delete this->consumerId;
     delete this->destination;
     delete this->messageId;
@@ -66,13 +66,17 @@
 ////////////////////////////////////////////////////////////////////////////////
 void MessagePull::copyDataStructure( const DataStructure* src ) {
 
+    // Protect against invalid self assignment.
+    if( this == src ) {
+        return;
+    }
+
     // Copy the data of the base class or classes
     BaseCommand::copyDataStructure( src );
 
     const MessagePull* srcPtr = dynamic_cast<const MessagePull*>( src );
 
     if( srcPtr == NULL || src == NULL ) {
-
         throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
             "MessagePull::copyDataStructure - src is NULL or invalid" );
@@ -136,6 +140,11 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 bool MessagePull::equals( const DataStructure* value ) const {
+
+    if( this == value ) {
+        return true;
+    }
+
     const MessagePull* valuePtr = dynamic_cast<const MessagePull*>( value );
 
     if( valuePtr == NULL || value == NULL ) {
@@ -192,7 +201,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void MessagePull::setConsumerId(ConsumerId* consumerId ) {
+void MessagePull::setConsumerId( ConsumerId* consumerId ) {
     this->consumerId = consumerId;
 }
 
@@ -207,7 +216,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void MessagePull::setDestination(ActiveMQDestination* destination ) {
+void MessagePull::setDestination( ActiveMQDestination* destination ) {
     this->destination = destination;
 }
 
@@ -217,7 +226,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void MessagePull::setTimeout(long long timeout ) {
+void MessagePull::setTimeout( long long timeout ) {
     this->timeout = timeout;
 }
 
@@ -232,7 +241,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void MessagePull::setCorrelationId(const std::string& correlationId ) {
+void MessagePull::setCorrelationId( const std::string& correlationId ) {
     this->correlationId = correlationId;
 }
 
@@ -247,7 +256,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void MessagePull::setMessageId(MessageId* messageId ) {
+void MessagePull::setMessageId( MessageId* messageId ) {
     this->messageId = messageId;
 }
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/MessagePull.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/MessagePull.h?rev=738877&r1=738876&r2=738877&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/MessagePull.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/MessagePull.h Thu Jan 29 15:02:56 2009
@@ -39,7 +39,7 @@
      *  Command and marshaling code for OpenWire format for MessagePull
      *
      *
-     *  NOTE!: This file is autogenerated - do not modify!
+     *  NOTE!: This file is auto generated - do not modify!
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      *
@@ -53,6 +53,11 @@
         std::string correlationId;
         MessageId* messageId;
 
+    protected:
+
+        MessagePull( const MessagePull& other );
+        MessagePull& operator= ( const MessagePull& other );
+
     public:
 
         const static unsigned char ID_MESSAGEPULL = 20;
@@ -64,7 +69,7 @@
 
         /**
          * Get the unique identifier that this object and its own
-         * Marshaller share.
+         * Marshaler share.
          * @returns new DataStructure type copy.
          */
         virtual unsigned char getDataStructureType() const;

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/NetworkBridgeFilter.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/NetworkBridgeFilter.cpp?rev=738877&r1=738876&r2=738877&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/NetworkBridgeFilter.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/NetworkBridgeFilter.cpp Thu Jan 29 15:02:56 2009
@@ -30,21 +30,21 @@
  *  Command and marshaling code for OpenWire format for NetworkBridgeFilter
  *
  *
- *  NOTE!: This file is autogenerated - do not modify!
+ *  NOTE!: This file is auto generated - do not modify!
  *         if you need to make a change, please see the Java Classes in the
  *         activemq-core module
  *
  */
 ////////////////////////////////////////////////////////////////////////////////
-NetworkBridgeFilter::NetworkBridgeFilter()
-{
+NetworkBridgeFilter::NetworkBridgeFilter() {
+
     this->networkTTL = 0;
     this->networkBrokerId = NULL;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-NetworkBridgeFilter::~NetworkBridgeFilter()
-{
+NetworkBridgeFilter::~NetworkBridgeFilter() {
+
     delete this->networkBrokerId;
 }
 
@@ -61,13 +61,17 @@
 ////////////////////////////////////////////////////////////////////////////////
 void NetworkBridgeFilter::copyDataStructure( const DataStructure* src ) {
 
+    // Protect against invalid self assignment.
+    if( this == src ) {
+        return;
+    }
+
     // Copy the data of the base class or classes
     BaseDataStructure::copyDataStructure( src );
 
     const NetworkBridgeFilter* srcPtr = dynamic_cast<const NetworkBridgeFilter*>( src );
 
     if( srcPtr == NULL || src == NULL ) {
-
         throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
             "NetworkBridgeFilter::copyDataStructure - src is NULL or invalid" );
@@ -107,6 +111,11 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 bool NetworkBridgeFilter::equals( const DataStructure* value ) const {
+
+    if( this == value ) {
+        return true;
+    }
+
     const NetworkBridgeFilter* valuePtr = dynamic_cast<const NetworkBridgeFilter*>( value );
 
     if( valuePtr == NULL || value == NULL ) {
@@ -134,7 +143,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void NetworkBridgeFilter::setNetworkTTL(int networkTTL ) {
+void NetworkBridgeFilter::setNetworkTTL( int networkTTL ) {
     this->networkTTL = networkTTL;
 }
 
@@ -149,7 +158,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void NetworkBridgeFilter::setNetworkBrokerId(BrokerId* networkBrokerId ) {
+void NetworkBridgeFilter::setNetworkBrokerId( BrokerId* networkBrokerId ) {
     this->networkBrokerId = networkBrokerId;
 }
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/NetworkBridgeFilter.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/NetworkBridgeFilter.h?rev=738877&r1=738876&r2=738877&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/NetworkBridgeFilter.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/NetworkBridgeFilter.h Thu Jan 29 15:02:56 2009
@@ -37,7 +37,7 @@
      *  Command and marshaling code for OpenWire format for NetworkBridgeFilter
      *
      *
-     *  NOTE!: This file is autogenerated - do not modify!
+     *  NOTE!: This file is auto generated - do not modify!
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      *
@@ -48,6 +48,11 @@
         int networkTTL;
         BrokerId* networkBrokerId;
 
+    protected:
+
+        NetworkBridgeFilter( const NetworkBridgeFilter& other );
+        NetworkBridgeFilter& operator= ( const NetworkBridgeFilter& other );
+
     public:
 
         const static unsigned char ID_NETWORKBRIDGEFILTER = 91;
@@ -59,7 +64,7 @@
 
         /**
          * Get the unique identifier that this object and its own
-         * Marshaller share.
+         * Marshaler share.
          * @returns new DataStructure type copy.
          */
         virtual unsigned char getDataStructureType() const;

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/PartialCommand.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/PartialCommand.cpp?rev=738877&r1=738876&r2=738877&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/PartialCommand.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/PartialCommand.cpp Thu Jan 29 15:02:56 2009
@@ -30,20 +30,20 @@
  *  Command and marshaling code for OpenWire format for PartialCommand
  *
  *
- *  NOTE!: This file is autogenerated - do not modify!
+ *  NOTE!: This file is auto generated - do not modify!
  *         if you need to make a change, please see the Java Classes in the
  *         activemq-core module
  *
  */
 ////////////////////////////////////////////////////////////////////////////////
-PartialCommand::PartialCommand()
-{
+PartialCommand::PartialCommand() {
+
     this->commandId = 0;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-PartialCommand::~PartialCommand()
-{
+PartialCommand::~PartialCommand() {
+
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -59,13 +59,17 @@
 ////////////////////////////////////////////////////////////////////////////////
 void PartialCommand::copyDataStructure( const DataStructure* src ) {
 
+    // Protect against invalid self assignment.
+    if( this == src ) {
+        return;
+    }
+
     // Copy the data of the base class or classes
     BaseDataStructure::copyDataStructure( src );
 
     const PartialCommand* srcPtr = dynamic_cast<const PartialCommand*>( src );
 
     if( srcPtr == NULL || src == NULL ) {
-
         throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
             "PartialCommand::copyDataStructure - src is NULL or invalid" );
@@ -98,6 +102,11 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 bool PartialCommand::equals( const DataStructure* value ) const {
+
+    if( this == value ) {
+        return true;
+    }
+
     const PartialCommand* valuePtr = dynamic_cast<const PartialCommand*>( value );
 
     if( valuePtr == NULL || value == NULL ) {
@@ -123,7 +132,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void PartialCommand::setCommandId(int commandId ) {
+void PartialCommand::setCommandId( int commandId ) {
     this->commandId = commandId;
 }
 
@@ -138,7 +147,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void PartialCommand::setData(const std::vector<unsigned char>& data ) {
+void PartialCommand::setData( const std::vector<unsigned char>& data ) {
     this->data = data;
 }
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/PartialCommand.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/PartialCommand.h?rev=738877&r1=738876&r2=738877&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/PartialCommand.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/PartialCommand.h Thu Jan 29 15:02:56 2009
@@ -36,7 +36,7 @@
      *  Command and marshaling code for OpenWire format for PartialCommand
      *
      *
-     *  NOTE!: This file is autogenerated - do not modify!
+     *  NOTE!: This file is auto generated - do not modify!
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      *
@@ -47,6 +47,11 @@
         int commandId;
         std::vector<unsigned char> data;
 
+    protected:
+
+        PartialCommand( const PartialCommand& other );
+        PartialCommand& operator= ( const PartialCommand& other );
+
     public:
 
         const static unsigned char ID_PARTIALCOMMAND = 60;
@@ -58,7 +63,7 @@
 
         /**
          * Get the unique identifier that this object and its own
-         * Marshaller share.
+         * Marshaler share.
          * @returns new DataStructure type copy.
          */
         virtual unsigned char getDataStructureType() const;



Mime
View raw message