activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r1460467 [6/15] - in /activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq: commands/ wireformat/openwire/marshal/generated/
Date Sun, 24 Mar 2013 21:30:56 GMT
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=1460467&r1=1460466&r2=1460467&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 Sun Mar 24 21:30:52 2013
@@ -21,8 +21,9 @@
 #include <activemq/commands/SessionId.h>
 #include <activemq/exceptions/ActiveMQException.h>
 #include <activemq/state/CommandVisitor.h>
-#include <apr_strings.h>
+#include <decaf/internal/util/StringUtils.h>
 #include <decaf/lang/exceptions/NullPointerException.h>
+#include <decaf/util/HashCode.h>
 #include <sstream>
 
 using namespace std;
@@ -31,6 +32,7 @@ using namespace activemq::exceptions;
 using namespace activemq::commands;
 using namespace decaf::lang;
 using namespace decaf::lang::exceptions;
+using namespace decaf::internal::util;
 
 /*
  *
@@ -43,37 +45,37 @@ using namespace decaf::lang::exceptions;
  */
 
 ////////////////////////////////////////////////////////////////////////////////
-SessionId::SessionId() 
-    : BaseDataStructure(), connectionId(""), value(0), parentId() {
+SessionId::SessionId() :
+    BaseDataStructure(), connectionId(""), value(0), parentId() {
 
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-SessionId::SessionId( const SessionId& other )
-    : BaseDataStructure(), connectionId(""), value(0), parentId() {
+SessionId::SessionId(const SessionId& other) :
+    BaseDataStructure(), connectionId(""), value(0), parentId() {
 
-    this->copyDataStructure( &other );
+    this->copyDataStructure(&other);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-SessionId::SessionId( const ConnectionId* connectionId, long long sessionId )
-    : BaseDataStructure(), connectionId(""), value(0), parentId() {
+SessionId::SessionId(const ConnectionId* connectionId, long long sessionId) :
+    BaseDataStructure(), connectionId(""), value(0), parentId() {
 
     this->connectionId = connectionId->getValue();
     this->value = sessionId;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-SessionId::SessionId( const ProducerId* producerId )
-    : BaseDataStructure(), connectionId(""), value(0), parentId() {
+SessionId::SessionId(const ProducerId* producerId) :
+    BaseDataStructure(), connectionId(""), value(0), parentId() {
 
     this->connectionId = producerId->getConnectionId();
     this->value = producerId->getSessionId();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-SessionId::SessionId( const ConsumerId* consumerId )
-    : BaseDataStructure(), connectionId(""), value(0), parentId() {
+SessionId::SessionId(const ConsumerId* consumerId) :
+    BaseDataStructure(), connectionId(""), value(0), parentId() {
 
     this->connectionId = consumerId->getConnectionId();
     this->value = consumerId->getSessionId();
@@ -85,35 +87,35 @@ SessionId::~SessionId() {
 
 ////////////////////////////////////////////////////////////////////////////////
 SessionId* SessionId::cloneDataStructure() const {
-    std::auto_ptr<SessionId> sessionId( new SessionId() );
+    std::auto_ptr<SessionId> sessionId(new SessionId());
 
     // Copy the data from the base class or classes
-    sessionId->copyDataStructure( this );
+    sessionId->copyDataStructure(this);
 
     return sessionId.release();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void SessionId::copyDataStructure( const DataStructure* src ) {
+void SessionId::copyDataStructure(const DataStructure* src) {
 
     // Protect against invalid self assignment.
-    if( this == src ) {
+    if (this == src) {
         return;
     }
 
-    const SessionId* srcPtr = dynamic_cast<const SessionId*>( src );
+    const SessionId* srcPtr = dynamic_cast<const SessionId*>(src);
 
-    if( srcPtr == NULL || src == NULL ) {
+    if (srcPtr == NULL || src == NULL) {
         throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
-            "SessionId::copyDataStructure - src is NULL or invalid" );
+            "SessionId::copyDataStructure - src is NULL or invalid");
     }
 
     // Copy the data of the base class or classes
-    BaseDataStructure::copyDataStructure( src );
+    BaseDataStructure::copyDataStructure(src);
 
-    this->setConnectionId( srcPtr->getConnectionId() );
-    this->setValue( srcPtr->getValue() );
+    this->setConnectionId(srcPtr->getConnectionId());
+    this->setValue(srcPtr->getValue());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -132,25 +134,25 @@ std::string SessionId::toString() const 
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-bool SessionId::equals( const DataStructure* value ) const {
+bool SessionId::equals(const DataStructure* value) const {
 
-    if( this == value ) {
+    if (this == value) {
         return true;
     }
 
-    const SessionId* valuePtr = dynamic_cast<const SessionId*>( value );
+    const SessionId* valuePtr = dynamic_cast<const SessionId*>(value);
 
-    if( valuePtr == NULL || value == NULL ) {
+    if (valuePtr == NULL || value == NULL) {
         return false;
     }
 
-    if( this->getConnectionId() != valuePtr->getConnectionId() ) {
+    if (this->getConnectionId() != valuePtr->getConnectionId()) {
         return false;
     }
-    if( this->getValue() != valuePtr->getValue() ) {
+    if (this->getValue() != valuePtr->getValue()) {
         return false;
     }
-    if( !BaseDataStructure::equals( value ) ) {
+    if (!BaseDataStructure::equals(value)) {
         return false;
     }
     return true;
@@ -167,7 +169,7 @@ std::string& SessionId::getConnectionId(
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void SessionId::setConnectionId( const std::string& connectionId ) {
+void SessionId::setConnectionId(const std::string& connectionId) {
     this->connectionId = connectionId;
 }
 
@@ -177,25 +179,25 @@ long long SessionId::getValue() const {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void SessionId::setValue( long long value ) {
+void SessionId::setValue(long long value) {
     this->value = value;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-int SessionId::compareTo( const SessionId& value ) const {
+int SessionId::compareTo(const SessionId& value) const {
 
-    if( this == &value ) {
+    if (this == &value) {
         return 0;
     }
 
-    int connectionIdComp = apr_strnatcasecmp( this->connectionId.c_str(), value.connectionId.c_str() );
-    if( connectionIdComp != 0 ) {
+    int connectionIdComp = StringUtils::compareIgnoreCase(this->connectionId.c_str(), value.connectionId.c_str());
+    if (connectionIdComp != 0) {
         return connectionIdComp;
     }
 
-    if( this->value > value.value ) {
+    if (this->value > value.value) {
         return 1;
-    } else if( this->value < value.value ) {
+    } else if(this->value < value.value) {
         return -1;
     }
 
@@ -203,30 +205,35 @@ int SessionId::compareTo( const SessionI
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-bool SessionId::equals( const SessionId& value ) const {
-    return this->equals( (const DataStructure*)&value );
+bool SessionId::equals(const SessionId& value) const {
+    return this->equals((const DataStructure*)&value);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-bool SessionId::operator==( const SessionId& value ) const {
-    return this->compareTo( value ) == 0;
+bool SessionId::operator==(const SessionId& value) const {
+    return this->compareTo(value) == 0;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-bool SessionId::operator<( const SessionId& value ) const {
-    return this->compareTo( value ) < 0;
+bool SessionId::operator<(const SessionId& value) const {
+    return this->compareTo(value) < 0;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-SessionId& SessionId::operator= ( const SessionId& other ) {
-    this->copyDataStructure( &other );
+SessionId& SessionId::operator= (const SessionId& other) {
+    this->copyDataStructure(&other);
     return *this;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+int SessionId::getHashCode() const {
+    return decaf::util::HashCode<std::string>()(this->toString());
+}
+
+////////////////////////////////////////////////////////////////////////////////
 const Pointer<ConnectionId>& SessionId::getParentId() const {
-    if( this->parentId == NULL ) {
-        this->parentId.reset( new ConnectionId( this ) );
+    if (this->parentId == NULL) {
+        this->parentId.reset(new ConnectionId(this));
     }
     return this->parentId;
 }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/SessionId.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/SessionId.h?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/SessionId.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/SessionId.h Sun Mar 24 21:30:52 2013
@@ -31,8 +31,8 @@
 #include <string>
 #include <vector>
 
-namespace activemq{
-namespace commands{
+namespace activemq {
+namespace commands {
 
     class ProducerId;
     class ConsumerId;
@@ -68,13 +68,13 @@ namespace commands{
 
         SessionId();
 
-        SessionId( const SessionId& other );
+        SessionId(const SessionId& other);
 
-        SessionId( const ConnectionId* connectionId, long long sessionId );
+        SessionId(const ConnectionId* connectionId, long long sessionId);
 
-        SessionId( const ProducerId* producerId );
+        SessionId(const ProducerId* producerId);
 
-        SessionId( const ConsumerId* consumerId );
+        SessionId(const ConsumerId* consumerId);
 
         virtual ~SessionId();
 
@@ -82,11 +82,11 @@ namespace commands{
 
         virtual SessionId* cloneDataStructure() const;
 
-        virtual void copyDataStructure( const DataStructure* src );
+        virtual void copyDataStructure(const DataStructure* src);
 
         virtual std::string toString() const;
 
-        virtual bool equals( const DataStructure* value ) const;
+        virtual bool equals(const DataStructure* value) const;
 
         const Pointer<ConnectionId>& getParentId() const;
 
@@ -97,15 +97,17 @@ namespace commands{
         virtual long long getValue() const;
         virtual void setValue( long long value );
 
-        virtual int compareTo( const SessionId& value ) const;
+        virtual int compareTo(const SessionId& value) const;
 
-        virtual bool equals( const SessionId& value ) const;
+        virtual bool equals(const SessionId& value) const;
 
-        virtual bool operator==( const SessionId& value ) const;
+        virtual bool operator==(const SessionId& value) const;
 
-        virtual bool operator<( const SessionId& value ) const;
+        virtual bool operator<(const SessionId& value) const;
 
-        SessionId& operator= ( const SessionId& other );
+        SessionId& operator= (const SessionId& other);
+
+        int getHashCode() const;
 
     };
 

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=1460467&r1=1460466&r2=1460467&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 Sun Mar 24 21:30:52 2013
@@ -39,8 +39,8 @@ using namespace decaf::lang::exceptions;
  */
 
 ////////////////////////////////////////////////////////////////////////////////
-SessionInfo::SessionInfo() 
-    : BaseCommand(), sessionId(NULL), ackMode((unsigned int)cms::Session::AUTO_ACKNOWLEDGE) {
+SessionInfo::SessionInfo() :
+    BaseCommand(), sessionId(NULL), ackMode((unsigned int)cms::Session::AUTO_ACKNOWLEDGE) {
 
 }
 
@@ -50,34 +50,34 @@ SessionInfo::~SessionInfo() {
 
 ////////////////////////////////////////////////////////////////////////////////
 SessionInfo* SessionInfo::cloneDataStructure() const {
-    std::auto_ptr<SessionInfo> sessionInfo( new SessionInfo() );
+    std::auto_ptr<SessionInfo> sessionInfo(new SessionInfo());
 
     // Copy the data from the base class or classes
-    sessionInfo->copyDataStructure( this );
+    sessionInfo->copyDataStructure(this);
 
     return sessionInfo.release();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void SessionInfo::copyDataStructure( const DataStructure* src ) {
+void SessionInfo::copyDataStructure(const DataStructure* src) {
 
     // Protect against invalid self assignment.
-    if( this == src ) {
+    if (this == src) {
         return;
     }
 
-    const SessionInfo* srcPtr = dynamic_cast<const SessionInfo*>( src );
+    const SessionInfo* srcPtr = dynamic_cast<const SessionInfo*>(src);
 
-    if( srcPtr == NULL || src == NULL ) {
+    if (srcPtr == NULL || src == NULL) {
         throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
-            "SessionInfo::copyDataStructure - src is NULL or invalid" );
+            "SessionInfo::copyDataStructure - src is NULL or invalid");
     }
 
     // Copy the data of the base class or classes
-    BaseCommand::copyDataStructure( src );
+    BaseCommand::copyDataStructure(src);
 
-    this->setSessionId( srcPtr->getSessionId() );
+    this->setSessionId(srcPtr->getSessionId());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -95,7 +95,7 @@ std::string SessionInfo::toString() cons
            << "responseRequired = " << boolalpha << this->isResponseRequired();
     stream << ", ";
     stream << "SessionId = ";
-    if( this->getSessionId() != NULL ) {
+    if (this->getSessionId() != NULL) {
         stream << this->getSessionId()->toString();
     } else {
         stream << "NULL";
@@ -106,26 +106,26 @@ std::string SessionInfo::toString() cons
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-bool SessionInfo::equals( const DataStructure* value ) const {
+bool SessionInfo::equals(const DataStructure* value) const {
 
-    if( this == value ) {
+    if (this == value) {
         return true;
     }
 
-    const SessionInfo* valuePtr = dynamic_cast<const SessionInfo*>( value );
+    const SessionInfo* valuePtr = dynamic_cast<const SessionInfo*>(value);
 
-    if( valuePtr == NULL || value == NULL ) {
+    if (valuePtr == NULL || value == NULL) {
         return false;
     }
 
-    if( this->getSessionId() != NULL ) {
-        if( !this->getSessionId()->equals( valuePtr->getSessionId().get() ) ) {
+    if (this->getSessionId() != NULL) {
+        if (!this->getSessionId()->equals( valuePtr->getSessionId().get())) {
             return false;
         }
-    } else if( valuePtr->getSessionId() != NULL ) {
+    } else if (valuePtr->getSessionId() != NULL) {
         return false;
     }
-    if( !BaseCommand::equals( value ) ) {
+    if (!BaseCommand::equals(value)) {
         return false;
     }
     return true;
@@ -142,20 +142,19 @@ decaf::lang::Pointer<SessionId>& Session
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void SessionInfo::setSessionId( const decaf::lang::Pointer<SessionId>& sessionId ) {
+void SessionInfo::setSessionId(const decaf::lang::Pointer<SessionId>& sessionId) {
     this->sessionId = sessionId;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-decaf::lang::Pointer<commands::Command> SessionInfo::visit( activemq::state::CommandVisitor* visitor ) {
-
-    return visitor->processSessionInfo( this );
+decaf::lang::Pointer<commands::Command> SessionInfo::visit(activemq::state::CommandVisitor* visitor) {
+    return visitor->processSessionInfo(this);
 }
 ////////////////////////////////////////////////////////////////////////////////
 Pointer<RemoveInfo> SessionInfo::createRemoveCommand() const {
-    Pointer<RemoveInfo> info( new RemoveInfo() );
-    info->setResponseRequired( this->isResponseRequired() );
-    info->setObjectId( this->getSessionId() );
+    Pointer<RemoveInfo> info(new RemoveInfo());
+    info->setResponseRequired(this->isResponseRequired());
+    info->setObjectId(this->getSessionId());
     return info;
 }
 

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=1460467&r1=1460466&r2=1460467&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 Sun Mar 24 21:30:52 2013
@@ -31,8 +31,8 @@
 #include <string>
 #include <vector>
 
-namespace activemq{
-namespace commands{
+namespace activemq {
+namespace commands {
 
     using decaf::lang::Pointer;
 
@@ -61,8 +61,8 @@ namespace commands{
 
     private:
 
-        SessionInfo( const SessionInfo& );
-        SessionInfo& operator= ( const SessionInfo& );
+        SessionInfo(const SessionInfo&);
+        SessionInfo& operator= (const SessionInfo&);
 
     public:
 
@@ -74,17 +74,17 @@ namespace commands{
 
         virtual SessionInfo* cloneDataStructure() const;
 
-        virtual void copyDataStructure( const DataStructure* src );
+        virtual void copyDataStructure(const DataStructure* src);
 
         virtual std::string toString() const;
 
-        virtual bool equals( const DataStructure* value ) const;
+        virtual bool equals(const DataStructure* value) const;
 
         unsigned int getAckMode() const {
             return this->ackMode;
         }
 
-        void setAckMode( unsigned int mode ) {
+        void setAckMode(unsigned int mode) {
             this->ackMode = mode;
         }
 
@@ -94,7 +94,7 @@ namespace commands{
         virtual Pointer<SessionId>& getSessionId();
         virtual void setSessionId( const Pointer<SessionId>& sessionId );
 
-        virtual Pointer<Command> visit( activemq::state::CommandVisitor* visitor );
+        virtual Pointer<Command> visit(activemq::state::CommandVisitor* visitor);
 
     };
 

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=1460467&r1=1460466&r2=1460467&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 Sun Mar 24 21:30:52 2013
@@ -38,8 +38,8 @@ using namespace decaf::lang::exceptions;
  */
 
 ////////////////////////////////////////////////////////////////////////////////
-ShutdownInfo::ShutdownInfo() 
-    : BaseCommand() {
+ShutdownInfo::ShutdownInfo() :
+    BaseCommand() {
 
 }
 
@@ -49,32 +49,32 @@ ShutdownInfo::~ShutdownInfo() {
 
 ////////////////////////////////////////////////////////////////////////////////
 ShutdownInfo* ShutdownInfo::cloneDataStructure() const {
-    std::auto_ptr<ShutdownInfo> shutdownInfo( new ShutdownInfo() );
+    std::auto_ptr<ShutdownInfo> shutdownInfo(new ShutdownInfo());
 
     // Copy the data from the base class or classes
-    shutdownInfo->copyDataStructure( this );
+    shutdownInfo->copyDataStructure(this);
 
     return shutdownInfo.release();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ShutdownInfo::copyDataStructure( const DataStructure* src ) {
+void ShutdownInfo::copyDataStructure(const DataStructure* src) {
 
     // Protect against invalid self assignment.
-    if( this == src ) {
+    if (this == src) {
         return;
     }
 
-    const ShutdownInfo* srcPtr = dynamic_cast<const ShutdownInfo*>( src );
+    const ShutdownInfo* srcPtr = dynamic_cast<const ShutdownInfo*>(src);
 
-    if( srcPtr == NULL || src == NULL ) {
+    if (srcPtr == NULL || src == NULL) {
         throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
-            "ShutdownInfo::copyDataStructure - src is NULL or invalid" );
+            "ShutdownInfo::copyDataStructure - src is NULL or invalid");
     }
 
     // Copy the data of the base class or classes
-    BaseCommand::copyDataStructure( src );
+    BaseCommand::copyDataStructure(src);
 
 }
 
@@ -97,26 +97,25 @@ std::string ShutdownInfo::toString() con
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-bool ShutdownInfo::equals( const DataStructure* value ) const {
+bool ShutdownInfo::equals(const DataStructure* value) const {
 
-    if( this == value ) {
+    if (this == value) {
         return true;
     }
 
-    const ShutdownInfo* valuePtr = dynamic_cast<const ShutdownInfo*>( value );
+    const ShutdownInfo* valuePtr = dynamic_cast<const ShutdownInfo*>(value);
 
-    if( valuePtr == NULL || value == NULL ) {
+    if (valuePtr == NULL || value == NULL) {
         return false;
     }
 
-    if( !BaseCommand::equals( value ) ) {
+    if (!BaseCommand::equals(value)) {
         return false;
     }
     return true;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-decaf::lang::Pointer<commands::Command> ShutdownInfo::visit( activemq::state::CommandVisitor* visitor ) {
-
-    return visitor->processShutdownInfo( this );
+decaf::lang::Pointer<commands::Command> ShutdownInfo::visit(activemq::state::CommandVisitor* visitor) {
+    return visitor->processShutdownInfo(this);
 }

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=1460467&r1=1460466&r2=1460467&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 Sun Mar 24 21:30:52 2013
@@ -29,8 +29,8 @@
 #include <string>
 #include <vector>
 
-namespace activemq{
-namespace commands{
+namespace activemq {
+namespace commands {
 
     using decaf::lang::Pointer;
 
@@ -53,8 +53,8 @@ namespace commands{
 
     private:
 
-        ShutdownInfo( const ShutdownInfo& );
-        ShutdownInfo& operator= ( const ShutdownInfo& );
+        ShutdownInfo(const ShutdownInfo&);
+        ShutdownInfo& operator= (const ShutdownInfo&);
 
     public:
 
@@ -66,11 +66,11 @@ namespace commands{
 
         virtual ShutdownInfo* cloneDataStructure() const;
 
-        virtual void copyDataStructure( const DataStructure* src );
+        virtual void copyDataStructure(const DataStructure* src);
 
         virtual std::string toString() const;
 
-        virtual bool equals( const DataStructure* value ) const;
+        virtual bool equals(const DataStructure* value) const;
 
         /**
          * @return an answer of true to the isShutdownInfo() query.
@@ -79,7 +79,7 @@ namespace commands{
             return true;
         }
 
-        virtual Pointer<Command> visit( activemq::state::CommandVisitor* visitor );
+        virtual Pointer<Command> visit(activemq::state::CommandVisitor* visitor);
 
     };
 

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=1460467&r1=1460466&r2=1460467&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 Sun Mar 24 21:30:52 2013
@@ -38,8 +38,8 @@ using namespace decaf::lang::exceptions;
  */
 
 ////////////////////////////////////////////////////////////////////////////////
-SubscriptionInfo::SubscriptionInfo() 
-    : BaseDataStructure(), clientId(""), destination(NULL), selector(""), subcriptionName(""), subscribedDestination(NULL) {
+SubscriptionInfo::SubscriptionInfo() :
+    BaseDataStructure(), clientId(""), destination(NULL), selector(""), subcriptionName(""), subscribedDestination(NULL) {
 
 }
 
@@ -49,38 +49,38 @@ SubscriptionInfo::~SubscriptionInfo() {
 
 ////////////////////////////////////////////////////////////////////////////////
 SubscriptionInfo* SubscriptionInfo::cloneDataStructure() const {
-    std::auto_ptr<SubscriptionInfo> subscriptionInfo( new SubscriptionInfo() );
+    std::auto_ptr<SubscriptionInfo> subscriptionInfo(new SubscriptionInfo());
 
     // Copy the data from the base class or classes
-    subscriptionInfo->copyDataStructure( this );
+    subscriptionInfo->copyDataStructure(this);
 
     return subscriptionInfo.release();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void SubscriptionInfo::copyDataStructure( const DataStructure* src ) {
+void SubscriptionInfo::copyDataStructure(const DataStructure* src) {
 
     // Protect against invalid self assignment.
-    if( this == src ) {
+    if (this == src) {
         return;
     }
 
-    const SubscriptionInfo* srcPtr = dynamic_cast<const SubscriptionInfo*>( src );
+    const SubscriptionInfo* srcPtr = dynamic_cast<const SubscriptionInfo*>(src);
 
-    if( srcPtr == NULL || src == NULL ) {
+    if (srcPtr == NULL || src == NULL) {
         throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
-            "SubscriptionInfo::copyDataStructure - src is NULL or invalid" );
+            "SubscriptionInfo::copyDataStructure - src is NULL or invalid");
     }
 
     // Copy the data of the base class or classes
-    BaseDataStructure::copyDataStructure( src );
+    BaseDataStructure::copyDataStructure(src);
 
-    this->setClientId( srcPtr->getClientId() );
-    this->setDestination( srcPtr->getDestination() );
-    this->setSelector( srcPtr->getSelector() );
-    this->setSubcriptionName( srcPtr->getSubcriptionName() );
-    this->setSubscribedDestination( srcPtr->getSubscribedDestination() );
+    this->setClientId(srcPtr->getClientId());
+    this->setDestination(srcPtr->getDestination());
+    this->setSelector(srcPtr->getSelector());
+    this->setSubcriptionName(srcPtr->getSubcriptionName());
+    this->setSubscribedDestination(srcPtr->getSubscribedDestination());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -97,7 +97,7 @@ std::string SubscriptionInfo::toString()
     stream << "ClientId = " << this->getClientId();
     stream << ", ";
     stream << "Destination = ";
-    if( this->getDestination() != NULL ) {
+    if (this->getDestination() != NULL) {
         stream << this->getDestination()->toString();
     } else {
         stream << "NULL";
@@ -108,7 +108,7 @@ std::string SubscriptionInfo::toString()
     stream << "SubcriptionName = " << this->getSubcriptionName();
     stream << ", ";
     stream << "SubscribedDestination = ";
-    if( this->getSubscribedDestination() != NULL ) {
+    if (this->getSubscribedDestination() != NULL) {
         stream << this->getSubscribedDestination()->toString();
     } else {
         stream << "NULL";
@@ -119,42 +119,42 @@ std::string SubscriptionInfo::toString()
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-bool SubscriptionInfo::equals( const DataStructure* value ) const {
+bool SubscriptionInfo::equals(const DataStructure* value) const {
 
-    if( this == value ) {
+    if (this == value) {
         return true;
     }
 
-    const SubscriptionInfo* valuePtr = dynamic_cast<const SubscriptionInfo*>( value );
+    const SubscriptionInfo* valuePtr = dynamic_cast<const SubscriptionInfo*>(value);
 
-    if( valuePtr == NULL || value == NULL ) {
+    if (valuePtr == NULL || value == NULL) {
         return false;
     }
 
-    if( this->getClientId() != valuePtr->getClientId() ) {
+    if (this->getClientId() != valuePtr->getClientId()) {
         return false;
     }
-    if( this->getDestination() != NULL ) {
-        if( !this->getDestination()->equals( valuePtr->getDestination().get() ) ) {
+    if (this->getDestination() != NULL) {
+        if (!this->getDestination()->equals( valuePtr->getDestination().get())) {
             return false;
         }
-    } else if( valuePtr->getDestination() != NULL ) {
+    } else if (valuePtr->getDestination() != NULL) {
         return false;
     }
-    if( this->getSelector() != valuePtr->getSelector() ) {
+    if (this->getSelector() != valuePtr->getSelector()) {
         return false;
     }
-    if( this->getSubcriptionName() != valuePtr->getSubcriptionName() ) {
+    if (this->getSubcriptionName() != valuePtr->getSubcriptionName()) {
         return false;
     }
-    if( this->getSubscribedDestination() != NULL ) {
-        if( !this->getSubscribedDestination()->equals( valuePtr->getSubscribedDestination().get() ) ) {
+    if (this->getSubscribedDestination() != NULL) {
+        if (!this->getSubscribedDestination()->equals( valuePtr->getSubscribedDestination().get())) {
             return false;
         }
-    } else if( valuePtr->getSubscribedDestination() != NULL ) {
+    } else if (valuePtr->getSubscribedDestination() != NULL) {
         return false;
     }
-    if( !BaseDataStructure::equals( value ) ) {
+    if (!BaseDataStructure::equals(value)) {
         return false;
     }
     return true;
@@ -171,7 +171,7 @@ std::string& SubscriptionInfo::getClient
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void SubscriptionInfo::setClientId( const std::string& clientId ) {
+void SubscriptionInfo::setClientId(const std::string& clientId) {
     this->clientId = clientId;
 }
 
@@ -186,7 +186,7 @@ decaf::lang::Pointer<ActiveMQDestination
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void SubscriptionInfo::setDestination( const decaf::lang::Pointer<ActiveMQDestination>& destination ) {
+void SubscriptionInfo::setDestination(const decaf::lang::Pointer<ActiveMQDestination>& destination) {
     this->destination = destination;
 }
 
@@ -201,7 +201,7 @@ std::string& SubscriptionInfo::getSelect
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void SubscriptionInfo::setSelector( const std::string& selector ) {
+void SubscriptionInfo::setSelector(const std::string& selector) {
     this->selector = selector;
 }
 
@@ -216,7 +216,7 @@ std::string& SubscriptionInfo::getSubcri
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void SubscriptionInfo::setSubcriptionName( const std::string& subcriptionName ) {
+void SubscriptionInfo::setSubcriptionName(const std::string& subcriptionName) {
     this->subcriptionName = subcriptionName;
 }
 
@@ -231,7 +231,7 @@ decaf::lang::Pointer<ActiveMQDestination
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void SubscriptionInfo::setSubscribedDestination( const decaf::lang::Pointer<ActiveMQDestination>& subscribedDestination ) {
+void SubscriptionInfo::setSubscribedDestination(const decaf::lang::Pointer<ActiveMQDestination>& subscribedDestination) {
     this->subscribedDestination = subscribedDestination;
 }
 

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=1460467&r1=1460466&r2=1460467&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 Sun Mar 24 21:30:52 2013
@@ -30,8 +30,8 @@
 #include <string>
 #include <vector>
 
-namespace activemq{
-namespace commands{
+namespace activemq {
+namespace commands {
 
     using decaf::lang::Pointer;
 
@@ -59,8 +59,8 @@ namespace commands{
 
     private:
 
-        SubscriptionInfo( const SubscriptionInfo& );
-        SubscriptionInfo& operator= ( const SubscriptionInfo& );
+        SubscriptionInfo(const SubscriptionInfo&);
+        SubscriptionInfo& operator= (const SubscriptionInfo&);
 
     public:
 
@@ -72,11 +72,11 @@ namespace commands{
 
         virtual SubscriptionInfo* cloneDataStructure() const;
 
-        virtual void copyDataStructure( const DataStructure* src );
+        virtual void copyDataStructure(const DataStructure* src);
 
         virtual std::string toString() const;
 
-        virtual bool equals( const DataStructure* value ) const;
+        virtual bool equals(const DataStructure* value) const;
 
         virtual const std::string& getClientId() const;
         virtual std::string& getClientId();

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=1460467&r1=1460466&r2=1460467&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 Sun Mar 24 21:30:52 2013
@@ -18,8 +18,9 @@
 #include <activemq/commands/TransactionId.h>
 #include <activemq/exceptions/ActiveMQException.h>
 #include <activemq/state/CommandVisitor.h>
-#include <apr_strings.h>
+#include <decaf/internal/util/StringUtils.h>
 #include <decaf/lang/exceptions/NullPointerException.h>
+#include <decaf/util/HashCode.h>
 
 using namespace std;
 using namespace activemq;
@@ -27,6 +28,7 @@ using namespace activemq::exceptions;
 using namespace activemq::commands;
 using namespace decaf::lang;
 using namespace decaf::lang::exceptions;
+using namespace decaf::internal::util;
 
 /*
  *
@@ -39,16 +41,16 @@ 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 );
+    this->copyDataStructure(&other);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -57,32 +59,32 @@ TransactionId::~TransactionId() {
 
 ////////////////////////////////////////////////////////////////////////////////
 TransactionId* TransactionId::cloneDataStructure() const {
-    std::auto_ptr<TransactionId> transactionId( new TransactionId() );
+    std::auto_ptr<TransactionId> transactionId(new TransactionId());
 
     // Copy the data from the base class or classes
-    transactionId->copyDataStructure( this );
+    transactionId->copyDataStructure(this);
 
     return transactionId.release();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void TransactionId::copyDataStructure( const DataStructure* src ) {
+void TransactionId::copyDataStructure(const DataStructure* src) {
 
     // Protect against invalid self assignment.
-    if( this == src ) {
+    if (this == src) {
         return;
     }
 
-    const TransactionId* srcPtr = dynamic_cast<const TransactionId*>( src );
+    const TransactionId* srcPtr = dynamic_cast<const TransactionId*>(src);
 
-    if( srcPtr == NULL || src == NULL ) {
+    if (srcPtr == NULL || src == NULL) {
         throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
-            "TransactionId::copyDataStructure - src is NULL or invalid" );
+            "TransactionId::copyDataStructure - src is NULL or invalid");
     }
 
     // Copy the data of the base class or classes
-    BaseDataStructure::copyDataStructure( src );
+    BaseDataStructure::copyDataStructure(src);
 
 }
 
@@ -103,28 +105,28 @@ std::string TransactionId::toString() co
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-bool TransactionId::equals( const DataStructure* value ) const {
+bool TransactionId::equals(const DataStructure* value) const {
 
-    if( this == value ) {
+    if (this == value) {
         return true;
     }
 
-    const TransactionId* valuePtr = dynamic_cast<const TransactionId*>( value );
+    const TransactionId* valuePtr = dynamic_cast<const TransactionId*>(value);
 
-    if( valuePtr == NULL || value == NULL ) {
+    if (valuePtr == NULL || value == NULL) {
         return false;
     }
 
-    if( !BaseDataStructure::equals( value ) ) {
+    if (!BaseDataStructure::equals(value)) {
         return false;
     }
     return true;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-int TransactionId::compareTo( const TransactionId& value ) const {
+int TransactionId::compareTo(const TransactionId& value) const {
 
-    if( this == &value ) {
+    if (this == &value) {
         return 0;
     }
 
@@ -132,23 +134,28 @@ int TransactionId::compareTo( const Tran
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-bool TransactionId::equals( const TransactionId& value ) const {
-    return this->equals( (const DataStructure*)&value );
+bool TransactionId::equals(const TransactionId& value) const {
+    return this->equals((const DataStructure*)&value);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-bool TransactionId::operator==( const TransactionId& value ) const {
-    return this->compareTo( value ) == 0;
+bool TransactionId::operator==(const TransactionId& value) const {
+    return this->compareTo(value) == 0;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-bool TransactionId::operator<( const TransactionId& value ) const {
-    return this->compareTo( value ) < 0;
+bool TransactionId::operator<(const TransactionId& value) const {
+    return this->compareTo(value) < 0;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-TransactionId& TransactionId::operator= ( const TransactionId& other ) {
-    this->copyDataStructure( &other );
+TransactionId& TransactionId::operator= (const TransactionId& other) {
+    this->copyDataStructure(&other);
     return *this;
 }
 
+////////////////////////////////////////////////////////////////////////////////
+int TransactionId::getHashCode() const {
+    return decaf::util::HashCode<std::string>()(this->toString());
+}
+

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/TransactionId.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/TransactionId.h?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/TransactionId.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/TransactionId.h Sun Mar 24 21:30:52 2013
@@ -30,8 +30,8 @@
 #include <string>
 #include <vector>
 
-namespace activemq{
-namespace commands{
+namespace activemq {
+namespace commands {
 
     using decaf::lang::Pointer;
 
@@ -58,7 +58,7 @@ namespace commands{
 
         TransactionId();
 
-        TransactionId( const TransactionId& other );
+        TransactionId(const TransactionId& other);
 
         virtual ~TransactionId();
 
@@ -66,11 +66,11 @@ namespace commands{
 
         virtual TransactionId* cloneDataStructure() const;
 
-        virtual void copyDataStructure( const DataStructure* src );
+        virtual void copyDataStructure(const DataStructure* src);
 
         virtual std::string toString() const;
 
-        virtual bool equals( const DataStructure* value ) const;
+        virtual bool equals(const DataStructure* value) const;
 
         virtual bool isLocalTransactionId() const {
             return false;
@@ -80,15 +80,17 @@ namespace commands{
             return false;
         }
 
-        virtual int compareTo( const TransactionId& value ) const;
+        virtual int compareTo(const TransactionId& value) const;
 
-        virtual bool equals( const TransactionId& value ) const;
+        virtual bool equals(const TransactionId& value) const;
 
-        virtual bool operator==( const TransactionId& value ) const;
+        virtual bool operator==(const TransactionId& value) const;
 
-        virtual bool operator<( const TransactionId& value ) const;
+        virtual bool operator<(const TransactionId& value) const;
 
-        TransactionId& operator= ( const TransactionId& other );
+        TransactionId& operator= (const TransactionId& other);
+
+        int getHashCode() const;
 
     };
 

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=1460467&r1=1460466&r2=1460467&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 Sun Mar 24 21:30:52 2013
@@ -38,8 +38,8 @@ using namespace decaf::lang::exceptions;
  */
 
 ////////////////////////////////////////////////////////////////////////////////
-TransactionInfo::TransactionInfo() 
-    : BaseCommand(), connectionId(NULL), transactionId(NULL), type(0) {
+TransactionInfo::TransactionInfo() :
+    BaseCommand(), connectionId(NULL), transactionId(NULL), type(0) {
 
 }
 
@@ -49,36 +49,36 @@ TransactionInfo::~TransactionInfo() {
 
 ////////////////////////////////////////////////////////////////////////////////
 TransactionInfo* TransactionInfo::cloneDataStructure() const {
-    std::auto_ptr<TransactionInfo> transactionInfo( new TransactionInfo() );
+    std::auto_ptr<TransactionInfo> transactionInfo(new TransactionInfo());
 
     // Copy the data from the base class or classes
-    transactionInfo->copyDataStructure( this );
+    transactionInfo->copyDataStructure(this);
 
     return transactionInfo.release();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void TransactionInfo::copyDataStructure( const DataStructure* src ) {
+void TransactionInfo::copyDataStructure(const DataStructure* src) {
 
     // Protect against invalid self assignment.
-    if( this == src ) {
+    if (this == src) {
         return;
     }
 
-    const TransactionInfo* srcPtr = dynamic_cast<const TransactionInfo*>( src );
+    const TransactionInfo* srcPtr = dynamic_cast<const TransactionInfo*>(src);
 
-    if( srcPtr == NULL || src == NULL ) {
+    if (srcPtr == NULL || src == NULL) {
         throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
-            "TransactionInfo::copyDataStructure - src is NULL or invalid" );
+            "TransactionInfo::copyDataStructure - src is NULL or invalid");
     }
 
     // Copy the data of the base class or classes
-    BaseCommand::copyDataStructure( src );
+    BaseCommand::copyDataStructure(src);
 
-    this->setConnectionId( srcPtr->getConnectionId() );
-    this->setTransactionId( srcPtr->getTransactionId() );
-    this->setType( srcPtr->getType() );
+    this->setConnectionId(srcPtr->getConnectionId());
+    this->setTransactionId(srcPtr->getTransactionId());
+    this->setType(srcPtr->getType());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -96,14 +96,14 @@ std::string TransactionInfo::toString() 
            << "responseRequired = " << boolalpha << this->isResponseRequired();
     stream << ", ";
     stream << "ConnectionId = ";
-    if( this->getConnectionId() != NULL ) {
+    if (this->getConnectionId() != NULL) {
         stream << this->getConnectionId()->toString();
     } else {
         stream << "NULL";
     }
     stream << ", ";
     stream << "TransactionId = ";
-    if( this->getTransactionId() != NULL ) {
+    if (this->getTransactionId() != NULL) {
         stream << this->getTransactionId()->toString();
     } else {
         stream << "NULL";
@@ -116,36 +116,36 @@ std::string TransactionInfo::toString() 
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-bool TransactionInfo::equals( const DataStructure* value ) const {
+bool TransactionInfo::equals(const DataStructure* value) const {
 
-    if( this == value ) {
+    if (this == value) {
         return true;
     }
 
-    const TransactionInfo* valuePtr = dynamic_cast<const TransactionInfo*>( value );
+    const TransactionInfo* valuePtr = dynamic_cast<const TransactionInfo*>(value);
 
-    if( valuePtr == NULL || value == NULL ) {
+    if (valuePtr == NULL || value == NULL) {
         return false;
     }
 
-    if( this->getConnectionId() != NULL ) {
-        if( !this->getConnectionId()->equals( valuePtr->getConnectionId().get() ) ) {
+    if (this->getConnectionId() != NULL) {
+        if (!this->getConnectionId()->equals( valuePtr->getConnectionId().get())) {
             return false;
         }
-    } else if( valuePtr->getConnectionId() != NULL ) {
+    } else if (valuePtr->getConnectionId() != NULL) {
         return false;
     }
-    if( this->getTransactionId() != NULL ) {
-        if( !this->getTransactionId()->equals( valuePtr->getTransactionId().get() ) ) {
+    if (this->getTransactionId() != NULL) {
+        if (!this->getTransactionId()->equals( valuePtr->getTransactionId().get())) {
             return false;
         }
-    } else if( valuePtr->getTransactionId() != NULL ) {
+    } else if (valuePtr->getTransactionId() != NULL) {
         return false;
     }
-    if( this->getType() != valuePtr->getType() ) {
+    if (this->getType() != valuePtr->getType()) {
         return false;
     }
-    if( !BaseCommand::equals( value ) ) {
+    if (!BaseCommand::equals(value)) {
         return false;
     }
     return true;
@@ -162,7 +162,7 @@ decaf::lang::Pointer<ConnectionId>& Tran
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void TransactionInfo::setConnectionId( const decaf::lang::Pointer<ConnectionId>& connectionId ) {
+void TransactionInfo::setConnectionId(const decaf::lang::Pointer<ConnectionId>& connectionId) {
     this->connectionId = connectionId;
 }
 
@@ -177,7 +177,7 @@ decaf::lang::Pointer<TransactionId>& Tra
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void TransactionInfo::setTransactionId( const decaf::lang::Pointer<TransactionId>& transactionId ) {
+void TransactionInfo::setTransactionId(const decaf::lang::Pointer<TransactionId>& transactionId) {
     this->transactionId = transactionId;
 }
 
@@ -187,12 +187,11 @@ unsigned char TransactionInfo::getType()
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void TransactionInfo::setType( unsigned char type ) {
+void TransactionInfo::setType(unsigned char type) {
     this->type = type;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-decaf::lang::Pointer<commands::Command> TransactionInfo::visit( activemq::state::CommandVisitor* visitor ) {
-
-    return visitor->processTransactionInfo( this );
+decaf::lang::Pointer<commands::Command> TransactionInfo::visit(activemq::state::CommandVisitor* visitor) {
+    return visitor->processTransactionInfo(this);
 }

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=1460467&r1=1460466&r2=1460467&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 Sun Mar 24 21:30:52 2013
@@ -31,8 +31,8 @@
 #include <string>
 #include <vector>
 
-namespace activemq{
-namespace commands{
+namespace activemq {
+namespace commands {
 
     using decaf::lang::Pointer;
 
@@ -58,8 +58,8 @@ namespace commands{
 
     private:
 
-        TransactionInfo( const TransactionInfo& );
-        TransactionInfo& operator= ( const TransactionInfo& );
+        TransactionInfo(const TransactionInfo&);
+        TransactionInfo& operator= (const TransactionInfo&);
 
     public:
 
@@ -71,11 +71,11 @@ namespace commands{
 
         virtual TransactionInfo* cloneDataStructure() const;
 
-        virtual void copyDataStructure( const DataStructure* src );
+        virtual void copyDataStructure(const DataStructure* src);
 
         virtual std::string toString() const;
 
-        virtual bool equals( const DataStructure* value ) const;
+        virtual bool equals(const DataStructure* value) const;
 
         virtual const Pointer<ConnectionId>& getConnectionId() const;
         virtual Pointer<ConnectionId>& getConnectionId();
@@ -95,7 +95,7 @@ namespace commands{
             return true;
         }
 
-        virtual Pointer<Command> visit( activemq::state::CommandVisitor* visitor );
+        virtual Pointer<Command> visit(activemq::state::CommandVisitor* visitor);
 
     };
 

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=1460467&r1=1460466&r2=1460467&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 Sun Mar 24 21:30:52 2013
@@ -18,9 +18,10 @@
 #include <activemq/commands/XATransactionId.h>
 #include <activemq/exceptions/ActiveMQException.h>
 #include <activemq/state/CommandVisitor.h>
-#include <apr_strings.h>
 #include <cms/XAException.h>
+#include <decaf/internal/util/StringUtils.h>
 #include <decaf/lang/exceptions/NullPointerException.h>
+#include <decaf/util/HashCode.h>
 
 using namespace std;
 using namespace activemq;
@@ -28,6 +29,7 @@ using namespace activemq::exceptions;
 using namespace activemq::commands;
 using namespace decaf::lang;
 using namespace decaf::lang::exceptions;
+using namespace decaf::internal::util;
 
 /*
  *
@@ -40,44 +42,44 @@ using namespace decaf::lang::exceptions;
  */
 
 ////////////////////////////////////////////////////////////////////////////////
-XATransactionId::XATransactionId() 
-    : TransactionId(), cms::Xid(), formatId(0), globalTransactionId(), branchQualifier() {
+XATransactionId::XATransactionId() :
+    TransactionId(), cms::Xid(), formatId(0), globalTransactionId(), branchQualifier() {
 
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-XATransactionId::XATransactionId( const XATransactionId& other )
-    : TransactionId(), cms::Xid(), formatId(0), globalTransactionId(), branchQualifier() {
+XATransactionId::XATransactionId(const XATransactionId& other) :
+    TransactionId(), cms::Xid(), formatId(0), globalTransactionId(), branchQualifier() {
 
-    this->copyDataStructure( &other );
+    this->copyDataStructure(&other);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-XATransactionId::XATransactionId( const cms::Xid* xid )
-    : TransactionId(), cms::Xid(), formatId(0), globalTransactionId(), branchQualifier() {
+XATransactionId::XATransactionId(const cms::Xid* xid) :
+    TransactionId(), cms::Xid(), formatId(0), globalTransactionId(), branchQualifier() {
 
-    if( xid == NULL ) {
+    if (xid == NULL) {
         return;
     }
 
     this->formatId = xid->getFormatId();
-    this->branchQualifier.resize( cms::Xid::MAXBQUALSIZE );
-    this->globalTransactionId.resize( cms::Xid::MAXGTRIDSIZE );
+    this->branchQualifier.resize(cms::Xid::MAXBQUALSIZE);
+    this->globalTransactionId.resize(cms::Xid::MAXGTRIDSIZE);
 
-    int result = xid->getBranchQualifier( &this->branchQualifier[0], cms::Xid::MAXBQUALSIZE );
+    int result = xid->getBranchQualifier(&this->branchQualifier[0], cms::Xid::MAXBQUALSIZE);
 
-    if( result == -1 ) {
-        throw cms::XAException("Invalid Xid Branch Qualifier is larger than MAXBQUALSIZE" );
+    if (result == -1) {
+        throw cms::XAException("Invalid Xid Branch Qualifier is larger than MAXBQUALSIZE");
     } else {
         this->branchQualifier.resize( result );
     }
 
-    result = xid->getGlobalTransactionId( &this->globalTransactionId[0], cms::Xid::MAXGTRIDSIZE );
+    result = xid->getGlobalTransactionId(&this->globalTransactionId[0], cms::Xid::MAXGTRIDSIZE);
 
-    if( result == -1 ) {
-        throw cms::XAException("Invalid Xid Global Transaction Id is larger than MAXGTRIDSIZE" );
+    if (result == -1) {
+        throw cms::XAException("Invalid Xid Global Transaction Id is larger than MAXGTRIDSIZE");
     } else {
-        this->globalTransactionId.resize( result );
+        this->globalTransactionId.resize(result);
     }
 }
 
@@ -87,36 +89,36 @@ XATransactionId::~XATransactionId() {
 
 ////////////////////////////////////////////////////////////////////////////////
 XATransactionId* XATransactionId::cloneDataStructure() const {
-    std::auto_ptr<XATransactionId> xATransactionId( new XATransactionId() );
+    std::auto_ptr<XATransactionId> xATransactionId(new XATransactionId());
 
     // Copy the data from the base class or classes
-    xATransactionId->copyDataStructure( this );
+    xATransactionId->copyDataStructure(this);
 
     return xATransactionId.release();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void XATransactionId::copyDataStructure( const DataStructure* src ) {
+void XATransactionId::copyDataStructure(const DataStructure* src) {
 
     // Protect against invalid self assignment.
-    if( this == src ) {
+    if (this == src) {
         return;
     }
 
-    const XATransactionId* srcPtr = dynamic_cast<const XATransactionId*>( src );
+    const XATransactionId* srcPtr = dynamic_cast<const XATransactionId*>(src);
 
-    if( srcPtr == NULL || src == NULL ) {
+    if (srcPtr == NULL || src == NULL) {
         throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
-            "XATransactionId::copyDataStructure - src is NULL or invalid" );
+            "XATransactionId::copyDataStructure - src is NULL or invalid");
     }
 
     // Copy the data of the base class or classes
-    TransactionId::copyDataStructure( src );
+    TransactionId::copyDataStructure(src);
 
-    this->setFormatId( srcPtr->getFormatId() );
-    this->setGlobalTransactionId( srcPtr->getGlobalTransactionId() );
-    this->setBranchQualifier( srcPtr->getBranchQualifier() );
+    this->setFormatId(srcPtr->getFormatId());
+    this->setGlobalTransactionId(srcPtr->getGlobalTransactionId());
+    this->setBranchQualifier(srcPtr->getBranchQualifier());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -133,9 +135,9 @@ std::string XATransactionId::toString() 
     stream << "FormatId = " << this->getFormatId();
     stream << ", ";
     stream << "GlobalTransactionId = ";
-    if( this->getGlobalTransactionId().size() > 0 ) {
+    if (this->getGlobalTransactionId().size() > 0) {
         stream << "[";
-        for( size_t iglobalTransactionId = 0; iglobalTransactionId < this->getGlobalTransactionId().size(); ++iglobalTransactionId ) {
+        for (size_t iglobalTransactionId = 0; iglobalTransactionId < this->getGlobalTransactionId().size(); ++iglobalTransactionId) {
             stream << this->getGlobalTransactionId()[iglobalTransactionId] << ",";
         }
         stream << "]";
@@ -144,9 +146,9 @@ std::string XATransactionId::toString() 
     }
     stream << ", ";
     stream << "BranchQualifier = ";
-    if( this->getBranchQualifier().size() > 0 ) {
+    if (this->getBranchQualifier().size() > 0) {
         stream << "[";
-        for( size_t ibranchQualifier = 0; ibranchQualifier < this->getBranchQualifier().size(); ++ibranchQualifier ) {
+        for (size_t ibranchQualifier = 0; ibranchQualifier < this->getBranchQualifier().size(); ++ibranchQualifier) {
             stream << this->getBranchQualifier()[ibranchQualifier] << ",";
         }
         stream << "]";
@@ -159,32 +161,32 @@ std::string XATransactionId::toString() 
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-bool XATransactionId::equals( const DataStructure* value ) const {
+bool XATransactionId::equals(const DataStructure* value) const {
 
-    if( this == value ) {
+    if (this == value) {
         return true;
     }
 
-    const XATransactionId* valuePtr = dynamic_cast<const XATransactionId*>( value );
+    const XATransactionId* valuePtr = dynamic_cast<const XATransactionId*>(value);
 
-    if( valuePtr == NULL || value == NULL ) {
+    if (valuePtr == NULL || value == NULL) {
         return false;
     }
 
-    if( this->getFormatId() != valuePtr->getFormatId() ) {
+    if (this->getFormatId() != valuePtr->getFormatId()) {
         return false;
     }
-    for( size_t iglobalTransactionId = 0; iglobalTransactionId < this->getGlobalTransactionId().size(); ++iglobalTransactionId ) {
-        if( this->getGlobalTransactionId()[iglobalTransactionId] != valuePtr->getGlobalTransactionId()[iglobalTransactionId] ) {
+    for (size_t iglobalTransactionId = 0; iglobalTransactionId < this->getGlobalTransactionId().size(); ++iglobalTransactionId) {
+        if (this->getGlobalTransactionId()[iglobalTransactionId] != valuePtr->getGlobalTransactionId()[iglobalTransactionId]) {
             return false;
         }
     }
-    for( size_t ibranchQualifier = 0; ibranchQualifier < this->getBranchQualifier().size(); ++ibranchQualifier ) {
-        if( this->getBranchQualifier()[ibranchQualifier] != valuePtr->getBranchQualifier()[ibranchQualifier] ) {
+    for (size_t ibranchQualifier = 0; ibranchQualifier < this->getBranchQualifier().size(); ++ibranchQualifier) {
+        if (this->getBranchQualifier()[ibranchQualifier] != valuePtr->getBranchQualifier()[ibranchQualifier]) {
             return false;
         }
     }
-    if( !TransactionId::equals( value ) ) {
+    if (!TransactionId::equals(value)) {
         return false;
     }
     return true;
@@ -196,7 +198,7 @@ int XATransactionId::getFormatId() const
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void XATransactionId::setFormatId( int formatId ) {
+void XATransactionId::setFormatId(int formatId) {
     this->formatId = formatId;
 }
 
@@ -211,7 +213,7 @@ std::vector<unsigned char>& XATransactio
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void XATransactionId::setGlobalTransactionId( const std::vector<unsigned char>& globalTransactionId ) {
+void XATransactionId::setGlobalTransactionId(const std::vector<unsigned char>& globalTransactionId) {
     this->globalTransactionId = globalTransactionId;
 }
 
@@ -226,32 +228,32 @@ std::vector<unsigned char>& XATransactio
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void XATransactionId::setBranchQualifier( const std::vector<unsigned char>& branchQualifier ) {
+void XATransactionId::setBranchQualifier(const std::vector<unsigned char>& branchQualifier) {
     this->branchQualifier = branchQualifier;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-int XATransactionId::compareTo( const XATransactionId& value ) const {
+int XATransactionId::compareTo(const XATransactionId& value) const {
 
-    if( this == &value ) {
+    if (this == &value) {
         return 0;
     }
 
-    if( this->formatId > value.formatId ) {
+    if (this->formatId > value.formatId) {
         return 1;
-    } else if( this->formatId < value.formatId ) {
+    } else if(this->formatId < value.formatId) {
         return -1;
     }
 
-    if( this->globalTransactionId > value.globalTransactionId ) {
+    if (this->globalTransactionId > value.globalTransactionId) {
         return 1;
-    } else if( this->globalTransactionId < value.globalTransactionId ) {
+    } else if(this->globalTransactionId < value.globalTransactionId) {
         return -1;
     }
 
-    if( this->branchQualifier > value.branchQualifier ) {
+    if (this->branchQualifier > value.branchQualifier) {
         return 1;
-    } else if( this->branchQualifier < value.branchQualifier ) {
+    } else if(this->branchQualifier < value.branchQualifier) {
         return -1;
     }
 
@@ -259,27 +261,32 @@ int XATransactionId::compareTo( const XA
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-bool XATransactionId::equals( const XATransactionId& value ) const {
-    return this->equals( (const DataStructure*)&value );
+bool XATransactionId::equals(const XATransactionId& value) const {
+    return this->equals((const DataStructure*)&value);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-bool XATransactionId::operator==( const XATransactionId& value ) const {
-    return this->compareTo( value ) == 0;
+bool XATransactionId::operator==(const XATransactionId& value) const {
+    return this->compareTo(value) == 0;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-bool XATransactionId::operator<( const XATransactionId& value ) const {
-    return this->compareTo( value ) < 0;
+bool XATransactionId::operator<(const XATransactionId& value) const {
+    return this->compareTo(value) < 0;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-XATransactionId& XATransactionId::operator= ( const XATransactionId& other ) {
-    this->copyDataStructure( &other );
+XATransactionId& XATransactionId::operator= (const XATransactionId& other) {
+    this->copyDataStructure(&other);
     return *this;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+int XATransactionId::getHashCode() const {
+    return decaf::util::HashCode<std::string>()(this->toString());
+}
+
+////////////////////////////////////////////////////////////////////////////////
 cms::Xid* XATransactionId::clone() const {
 
     XATransactionId* theClone = new XATransactionId();
@@ -292,33 +299,33 @@ cms::Xid* XATransactionId::clone() const
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-bool XATransactionId::equals( const cms::Xid* other ) const {
+bool XATransactionId::equals(const cms::Xid* other) const {
 
-    if( (void*)this == other ) {
+    if ((void*)this == other) {
         return true;
     }
 
-    if( other == NULL ) {
+    if (other == NULL) {
         return false;
     }
 
-    if( this->formatId != other->getFormatId() ) {
+    if (this->formatId != other->getFormatId()) {
         return false;
     }
 
-    std::vector<unsigned char> otherBQual( Xid::MAXBQUALSIZE );
+    std::vector<unsigned char> otherBQual(Xid::MAXBQUALSIZE);
 
-    other->getBranchQualifier( &otherBQual[0], Xid::MAXBQUALSIZE );
+    other->getBranchQualifier(&otherBQual[0], Xid::MAXBQUALSIZE);
 
-    if( this->branchQualifier != otherBQual ) {
+    if (this->branchQualifier != otherBQual) {
         return false;
     }
 
-    std::vector<unsigned char> otherGTXID( Xid::MAXBQUALSIZE );
+    std::vector<unsigned char> otherGTXID( Xid::MAXBQUALSIZE);
 
-    other->getGlobalTransactionId( &otherGTXID[0], Xid::MAXGTRIDSIZE );
+    other->getGlobalTransactionId( &otherGTXID[0], Xid::MAXGTRIDSIZE);
 
-    if( this->globalTransactionId != otherGTXID ) {
+    if (this->globalTransactionId != otherGTXID) {
         return false;
     }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/XATransactionId.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/XATransactionId.h?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/XATransactionId.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/XATransactionId.h Sun Mar 24 21:30:52 2013
@@ -31,8 +31,8 @@
 #include <string>
 #include <vector>
 
-namespace activemq{
-namespace commands{
+namespace activemq {
+namespace commands {
 
     using decaf::lang::Pointer;
 
@@ -62,7 +62,7 @@ namespace commands{
 
         XATransactionId();
 
-        XATransactionId( const XATransactionId& other );
+        XATransactionId(const XATransactionId& other);
 
         XATransactionId( const cms::Xid* xid );
 
@@ -72,11 +72,11 @@ namespace commands{
 
         virtual XATransactionId* cloneDataStructure() const;
 
-        virtual void copyDataStructure( const DataStructure* src );
+        virtual void copyDataStructure(const DataStructure* src);
 
         virtual std::string toString() const;
 
-        virtual bool equals( const DataStructure* value ) const;
+        virtual bool equals(const DataStructure* value) const;
 
         virtual bool isXATransactionId() const {
             return true;
@@ -86,11 +86,11 @@ namespace commands{
 
         virtual Xid* clone() const;
 
-        virtual bool equals( const Xid* other ) const;
+        virtual bool equals(const Xid* other) const;
 
-        virtual int getBranchQualifier( unsigned char* buffer, int size ) const;
+        virtual int getBranchQualifier(unsigned char* buffer, int size) const;
 
-        virtual int getGlobalTransactionId( unsigned char* buffer, int size ) const;
+        virtual int getGlobalTransactionId(unsigned char* buffer, int size) const;
 
         virtual int getFormatId() const;
         virtual void setFormatId( int formatId );
@@ -103,15 +103,17 @@ namespace commands{
         virtual std::vector<unsigned char>& getBranchQualifier();
         virtual void setBranchQualifier( const std::vector<unsigned char>& branchQualifier );
 
-        virtual int compareTo( const XATransactionId& value ) const;
+        virtual int compareTo(const XATransactionId& value) const;
 
-        virtual bool equals( const XATransactionId& value ) const;
+        virtual bool equals(const XATransactionId& value) const;
 
-        virtual bool operator==( const XATransactionId& value ) const;
+        virtual bool operator==(const XATransactionId& value) const;
 
-        virtual bool operator<( const XATransactionId& value ) const;
+        virtual bool operator<(const XATransactionId& value) const;
 
-        XATransactionId& operator= ( const XATransactionId& other );
+        XATransactionId& operator= (const XATransactionId& other);
+
+        int getHashCode() const;
 
     };
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ActiveMQBlobMessageMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ActiveMQBlobMessageMarshaller.cpp?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ActiveMQBlobMessageMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ActiveMQBlobMessageMarshaller.cpp Sun Mar 24 21:30:52 2013
@@ -51,137 +51,137 @@ unsigned char ActiveMQBlobMessageMarshal
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void ActiveMQBlobMessageMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) {
+void ActiveMQBlobMessageMarshaller::tightUnmarshal(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs) {
 
     try {
 
-        MessageMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs );
+        MessageMarshaller::tightUnmarshal(wireFormat, dataStructure, dataIn, bs);
 
         ActiveMQBlobMessage* info =
-            dynamic_cast<ActiveMQBlobMessage*>( dataStructure );
+            dynamic_cast<ActiveMQBlobMessage*>(dataStructure);
 
         int wireVersion = wireFormat->getVersion();
 
-        if( wireVersion >= 3 ) {
-            info->setRemoteBlobUrl( tightUnmarshalString( dataIn, bs ) );
+        if (wireVersion >= 3) {
+            info->setRemoteBlobUrl(tightUnmarshalString(dataIn, bs));
         }
-        if( wireVersion >= 3 ) {
-            info->setMimeType( tightUnmarshalString( dataIn, bs ) );
+        if (wireVersion >= 3) {
+            info->setMimeType(tightUnmarshalString(dataIn, bs));
         }
-        if( wireVersion >= 3 ) {
-            info->setDeletedByBroker( bs->readBoolean() );
+        if (wireVersion >= 3) {
+            info->setDeletedByBroker(bs->readBoolean());
         }
     }
-    AMQ_CATCH_RETHROW( decaf::io::IOException )
-    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
-    AMQ_CATCHALL_THROW( decaf::io::IOException )
+    AMQ_CATCH_RETHROW(decaf::io::IOException)
+    AMQ_CATCH_EXCEPTION_CONVERT(exceptions::ActiveMQException, decaf::io::IOException)
+    AMQ_CATCHALL_THROW(decaf::io::IOException)
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-int ActiveMQBlobMessageMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) {
+int ActiveMQBlobMessageMarshaller::tightMarshal1(OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs) {
 
     try {
 
         ActiveMQBlobMessage* info =
-            dynamic_cast<ActiveMQBlobMessage*>( dataStructure );
+            dynamic_cast<ActiveMQBlobMessage*>(dataStructure);
 
-        int rc = MessageMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
+        int rc = MessageMarshaller::tightMarshal1(wireFormat, dataStructure, bs);
 
         int wireVersion = wireFormat->getVersion();
 
-        if( wireVersion >= 3 ) {
-            rc += tightMarshalString1( info->getRemoteBlobUrl(), bs );
+        if (wireVersion >= 3) {
+            rc += tightMarshalString1(info->getRemoteBlobUrl(), bs);
         }
-        if( wireVersion >= 3 ) {
-            rc += tightMarshalString1( info->getMimeType(), bs );
+        if (wireVersion >= 3) {
+            rc += tightMarshalString1(info->getMimeType(), bs);
         }
-        if( wireVersion >= 3 ) {
-            bs->writeBoolean( info->isDeletedByBroker() );
+        if (wireVersion >= 3) {
+            bs->writeBoolean(info->isDeletedByBroker());
         }
 
         return rc + 0;
     }
-    AMQ_CATCH_RETHROW( decaf::io::IOException )
-    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
-    AMQ_CATCHALL_THROW( decaf::io::IOException )
+    AMQ_CATCH_RETHROW(decaf::io::IOException)
+    AMQ_CATCH_EXCEPTION_CONVERT(exceptions::ActiveMQException, decaf::io::IOException)
+    AMQ_CATCHALL_THROW(decaf::io::IOException)
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void ActiveMQBlobMessageMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) {
+void ActiveMQBlobMessageMarshaller::tightMarshal2(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs) {
 
     try {
 
-        MessageMarshaller::tightMarshal2( wireFormat, dataStructure, dataOut, bs );
+        MessageMarshaller::tightMarshal2(wireFormat, dataStructure, dataOut, bs );
 
         ActiveMQBlobMessage* info =
-            dynamic_cast<ActiveMQBlobMessage*>( dataStructure );
+            dynamic_cast<ActiveMQBlobMessage*>(dataStructure);
 
         int wireVersion = wireFormat->getVersion();
 
-        if( wireVersion >= 3 ) {
-            tightMarshalString2( info->getRemoteBlobUrl(), dataOut, bs );
+        if (wireVersion >= 3) {
+            tightMarshalString2(info->getRemoteBlobUrl(), dataOut, bs);
         }
-        if( wireVersion >= 3 ) {
-            tightMarshalString2( info->getMimeType(), dataOut, bs );
+        if (wireVersion >= 3) {
+            tightMarshalString2(info->getMimeType(), dataOut, bs);
         }
-        if( wireVersion >= 3 ) {
+        if (wireVersion >= 3) {
             bs->readBoolean();
         }
     }
-    AMQ_CATCH_RETHROW( decaf::io::IOException )
-    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
-    AMQ_CATCHALL_THROW( decaf::io::IOException )
+    AMQ_CATCH_RETHROW(decaf::io::IOException)
+    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException)
+    AMQ_CATCHALL_THROW(decaf::io::IOException)
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void ActiveMQBlobMessageMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) {
+void ActiveMQBlobMessageMarshaller::looseUnmarshal(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn) {
 
     try {
 
-        MessageMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
+        MessageMarshaller::looseUnmarshal(wireFormat, dataStructure, dataIn);
         ActiveMQBlobMessage* info =
-            dynamic_cast<ActiveMQBlobMessage*>( dataStructure );
+            dynamic_cast<ActiveMQBlobMessage*>(dataStructure);
 
         int wireVersion = wireFormat->getVersion();
 
-        if( wireVersion >= 3 ) {
-            info->setRemoteBlobUrl( looseUnmarshalString( dataIn ) );
+        if (wireVersion >= 3) {
+            info->setRemoteBlobUrl(looseUnmarshalString(dataIn));
         }
-        if( wireVersion >= 3 ) {
-            info->setMimeType( looseUnmarshalString( dataIn ) );
+        if (wireVersion >= 3) {
+            info->setMimeType(looseUnmarshalString(dataIn));
         }
-        if( wireVersion >= 3 ) {
-            info->setDeletedByBroker( dataIn->readBoolean() );
+        if (wireVersion >= 3) {
+            info->setDeletedByBroker(dataIn->readBoolean());
         }
     }
-    AMQ_CATCH_RETHROW( decaf::io::IOException )
-    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
-    AMQ_CATCHALL_THROW( decaf::io::IOException )
+    AMQ_CATCH_RETHROW(decaf::io::IOException)
+    AMQ_CATCH_EXCEPTION_CONVERT(exceptions::ActiveMQException, decaf::io::IOException)
+    AMQ_CATCHALL_THROW(decaf::io::IOException)
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void ActiveMQBlobMessageMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) {
+void ActiveMQBlobMessageMarshaller::looseMarshal(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut) {
 
     try {
 
         ActiveMQBlobMessage* info =
-            dynamic_cast<ActiveMQBlobMessage*>( dataStructure );
-        MessageMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
+            dynamic_cast<ActiveMQBlobMessage*>(dataStructure);
+        MessageMarshaller::looseMarshal(wireFormat, dataStructure, dataOut);
 
         int wireVersion = wireFormat->getVersion();
 
-        if( wireVersion >= 3 ) {
-            looseMarshalString( info->getRemoteBlobUrl(), dataOut );
+        if (wireVersion >= 3) {
+            looseMarshalString(info->getRemoteBlobUrl(), dataOut);
         }
-        if( wireVersion >= 3 ) {
-            looseMarshalString( info->getMimeType(), dataOut );
+        if (wireVersion >= 3) {
+            looseMarshalString(info->getMimeType(), dataOut);
         }
-        if( wireVersion >= 3 ) {
-            dataOut->writeBoolean( info->isDeletedByBroker() );
+        if (wireVersion >= 3) {
+            dataOut->writeBoolean(info->isDeletedByBroker());
         }
     }
-    AMQ_CATCH_RETHROW( decaf::io::IOException )
-    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
-    AMQ_CATCHALL_THROW( decaf::io::IOException )
+    AMQ_CATCH_RETHROW(decaf::io::IOException)
+    AMQ_CATCH_EXCEPTION_CONVERT(exceptions::ActiveMQException, decaf::io::IOException)
+    AMQ_CATCHALL_THROW(decaf::io::IOException)
 }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ActiveMQBlobMessageMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ActiveMQBlobMessageMarshaller.h?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ActiveMQBlobMessageMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ActiveMQBlobMessageMarshaller.h Sun Mar 24 21:30:52 2013
@@ -33,11 +33,11 @@
 #include <activemq/wireformat/openwire/OpenWireFormat.h>
 #include <activemq/wireformat/openwire/utils/BooleanStream.h>
 
-namespace activemq{
-namespace wireformat{
-namespace openwire{
-namespace marshal{
-namespace generated{
+namespace activemq {
+namespace wireformat {
+namespace openwire {
+namespace marshal {
+namespace generated {
 
     /**
      * Marshaling code for Open Wire Format for ActiveMQBlobMessageMarshaller
@@ -56,27 +56,27 @@ namespace generated{
 
         virtual unsigned char getDataStructureType() const;
 
-        virtual void tightUnmarshal( OpenWireFormat* wireFormat,
-                                     commands::DataStructure* dataStructure,
-                                     decaf::io::DataInputStream* dataIn,
-                                     utils::BooleanStream* bs );
+        virtual void tightUnmarshal(OpenWireFormat* wireFormat,
+                                    commands::DataStructure* dataStructure,
+                                    decaf::io::DataInputStream* dataIn,
+                                    utils::BooleanStream* bs);
+
+        virtual int tightMarshal1(OpenWireFormat* wireFormat,
+                                  commands::DataStructure* dataStructure,
+                                  utils::BooleanStream* bs);
 
-        virtual int tightMarshal1( OpenWireFormat* wireFormat,
+        virtual void tightMarshal2(OpenWireFormat* wireFormat,
                                    commands::DataStructure* dataStructure,
-                                   utils::BooleanStream* bs );
+                                   decaf::io::DataOutputStream* dataOut,
+                                   utils::BooleanStream* bs);
 
-        virtual void tightMarshal2( OpenWireFormat* wireFormat,
+        virtual void looseUnmarshal(OpenWireFormat* wireFormat,
                                     commands::DataStructure* dataStructure,
-                                    decaf::io::DataOutputStream* dataOut,
-                                    utils::BooleanStream* bs );
+                                    decaf::io::DataInputStream* dataIn);
 
-        virtual void looseUnmarshal( OpenWireFormat* wireFormat,
-                                     commands::DataStructure* dataStructure,
-                                     decaf::io::DataInputStream* dataIn );
-
-        virtual void looseMarshal( OpenWireFormat* wireFormat,
-                                   commands::DataStructure* dataStructure,
-                                   decaf::io::DataOutputStream* dataOut );
+        virtual void looseMarshal(OpenWireFormat* wireFormat,
+                                  commands::DataStructure* dataStructure,
+                                  decaf::io::DataOutputStream* dataOut);
 
     };
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ActiveMQBytesMessageMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ActiveMQBytesMessageMarshaller.cpp?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ActiveMQBytesMessageMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ActiveMQBytesMessageMarshaller.cpp Sun Mar 24 21:30:52 2013
@@ -51,87 +51,87 @@ unsigned char ActiveMQBytesMessageMarsha
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void ActiveMQBytesMessageMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) {
+void ActiveMQBytesMessageMarshaller::tightUnmarshal(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs) {
 
     try {
 
-        MessageMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs );
+        MessageMarshaller::tightUnmarshal(wireFormat, dataStructure, dataIn, bs);
 
         ActiveMQBytesMessage* info =
-            dynamic_cast<ActiveMQBytesMessage*>( dataStructure );
-        info->beforeUnmarshal( wireFormat );
+            dynamic_cast<ActiveMQBytesMessage*>(dataStructure);
+        info->beforeUnmarshal(wireFormat);
 
 
         info->afterUnmarshal( wireFormat );
     }
-    AMQ_CATCH_RETHROW( decaf::io::IOException )
-    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
-    AMQ_CATCHALL_THROW( decaf::io::IOException )
+    AMQ_CATCH_RETHROW(decaf::io::IOException)
+    AMQ_CATCH_EXCEPTION_CONVERT(exceptions::ActiveMQException, decaf::io::IOException)
+    AMQ_CATCHALL_THROW(decaf::io::IOException)
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-int ActiveMQBytesMessageMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) {
+int ActiveMQBytesMessageMarshaller::tightMarshal1(OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs) {
 
     try {
 
         ActiveMQBytesMessage* info =
-            dynamic_cast<ActiveMQBytesMessage*>( dataStructure );
+            dynamic_cast<ActiveMQBytesMessage*>(dataStructure);
 
-        info->beforeMarshal( wireFormat );
-        int rc = MessageMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
+        info->beforeMarshal(wireFormat);
+        int rc = MessageMarshaller::tightMarshal1(wireFormat, dataStructure, bs);
 
         return rc + 0;
     }
-    AMQ_CATCH_RETHROW( decaf::io::IOException )
-    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
-    AMQ_CATCHALL_THROW( decaf::io::IOException )
+    AMQ_CATCH_RETHROW(decaf::io::IOException)
+    AMQ_CATCH_EXCEPTION_CONVERT(exceptions::ActiveMQException, decaf::io::IOException)
+    AMQ_CATCHALL_THROW(decaf::io::IOException)
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void ActiveMQBytesMessageMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) {
+void ActiveMQBytesMessageMarshaller::tightMarshal2(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs) {
 
     try {
 
-        MessageMarshaller::tightMarshal2( wireFormat, dataStructure, dataOut, bs );
+        MessageMarshaller::tightMarshal2(wireFormat, dataStructure, dataOut, bs );
 
         ActiveMQBytesMessage* info =
-            dynamic_cast<ActiveMQBytesMessage*>( dataStructure );
-        info->afterMarshal( wireFormat );
+            dynamic_cast<ActiveMQBytesMessage*>(dataStructure);
+        info->afterMarshal(wireFormat);
     }
-    AMQ_CATCH_RETHROW( decaf::io::IOException )
-    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
-    AMQ_CATCHALL_THROW( decaf::io::IOException )
+    AMQ_CATCH_RETHROW(decaf::io::IOException)
+    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException)
+    AMQ_CATCHALL_THROW(decaf::io::IOException)
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void ActiveMQBytesMessageMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) {
+void ActiveMQBytesMessageMarshaller::looseUnmarshal(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn) {
 
     try {
 
-        MessageMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
+        MessageMarshaller::looseUnmarshal(wireFormat, dataStructure, dataIn);
         ActiveMQBytesMessage* info =
-            dynamic_cast<ActiveMQBytesMessage*>( dataStructure );
-        info->beforeUnmarshal( wireFormat );
-        info->afterUnmarshal( wireFormat );
+            dynamic_cast<ActiveMQBytesMessage*>(dataStructure);
+        info->beforeUnmarshal(wireFormat);
+        info->afterUnmarshal(wireFormat);
     }
-    AMQ_CATCH_RETHROW( decaf::io::IOException )
-    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
-    AMQ_CATCHALL_THROW( decaf::io::IOException )
+    AMQ_CATCH_RETHROW(decaf::io::IOException)
+    AMQ_CATCH_EXCEPTION_CONVERT(exceptions::ActiveMQException, decaf::io::IOException)
+    AMQ_CATCHALL_THROW(decaf::io::IOException)
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void ActiveMQBytesMessageMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) {
+void ActiveMQBytesMessageMarshaller::looseMarshal(OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut) {
 
     try {
 
         ActiveMQBytesMessage* info =
-            dynamic_cast<ActiveMQBytesMessage*>( dataStructure );
-        info->beforeMarshal( wireFormat );
-        MessageMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
-        info->afterMarshal( wireFormat );
+            dynamic_cast<ActiveMQBytesMessage*>(dataStructure);
+        info->beforeMarshal(wireFormat);
+        MessageMarshaller::looseMarshal(wireFormat, dataStructure, dataOut);
+        info->afterMarshal(wireFormat);
     }
-    AMQ_CATCH_RETHROW( decaf::io::IOException )
-    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
-    AMQ_CATCHALL_THROW( decaf::io::IOException )
+    AMQ_CATCH_RETHROW(decaf::io::IOException)
+    AMQ_CATCH_EXCEPTION_CONVERT(exceptions::ActiveMQException, decaf::io::IOException)
+    AMQ_CATCHALL_THROW(decaf::io::IOException)
 }
 



Mime
View raw message