activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r508910 - /activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/
Date Sun, 18 Feb 2007 16:08:59 GMT
Author: tabish
Date: Sun Feb 18 08:08:58 2007
New Revision: 508910

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

Regenerated Marshallers for the ActiveMQXXX commands.

Modified:
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ActiveMQBytesMessageMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ActiveMQBytesMessageMarshaller.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ActiveMQMapMessageMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ActiveMQMapMessageMarshaller.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ActiveMQObjectMessageMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ActiveMQObjectMessageMarshaller.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ActiveMQStreamMessageMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ActiveMQStreamMessageMarshaller.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTextMessageMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTextMessageMarshaller.h

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ActiveMQBytesMessageMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ActiveMQBytesMessageMarshaller.cpp?view=diff&rev=508910&r1=508909&r2=508910
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ActiveMQBytesMessageMarshaller.cpp
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ActiveMQBytesMessageMarshaller.cpp
Sun Feb 18 08:08:58 2007
@@ -48,14 +48,24 @@
 ///////////////////////////////////////////////////////////////////////////////
 void ActiveMQBytesMessageMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure*
dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( io::IOException ) {
 
-    ActiveMQMessageMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs );
+    MessageMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs );
 
+    ActiveMQBytesMessage* info =
+        dynamic_cast<ActiveMQBytesMessage*>( dataStructure );
+    info->beforeUnmarshal( wireFormat );
+
+
+    info->afterUnmarshal( wireFormat );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 int ActiveMQBytesMessageMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure*
dataStructure, BooleanStream* bs ) throw( io::IOException ) {
 
-    int rc = ActiveMQMessageMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
+    ActiveMQBytesMessage* info =
+        dynamic_cast<ActiveMQBytesMessage*>( dataStructure );
+
+    info->beforeMarshal( wireFormat );
+    int rc = MessageMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
 
     return rc + 0;
 }
@@ -63,20 +73,31 @@
 ///////////////////////////////////////////////////////////////////////////////
 void ActiveMQBytesMessageMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure*
dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( io::IOException ) {
 
-    ActiveMQMessageMarshaller::tightMarshal2( wireFormat, dataStructure, dataOut, bs );
+    MessageMarshaller::tightMarshal2( wireFormat, dataStructure, dataOut, bs );
 
+    ActiveMQBytesMessage* info =
+        dynamic_cast<ActiveMQBytesMessage*>( dataStructure );
+    info->afterMarshal( wireFormat );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 void ActiveMQBytesMessageMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure*
dataStructure, DataInputStream* dataIn ) throw( io::IOException ) {
 
-    ActiveMQMessageMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
+    MessageMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
+    ActiveMQBytesMessage* info =
+        dynamic_cast<ActiveMQBytesMessage*>( dataStructure );
+    info->beforeUnmarshal( wireFormat );
+    info->afterUnmarshal( wireFormat );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 void ActiveMQBytesMessageMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure*
dataStructure, DataOutputStream* dataOut ) throw( io::IOException ) {
 
-    ActiveMQMessageMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
+    ActiveMQBytesMessage* info =
+        dynamic_cast<ActiveMQBytesMessage*>( dataStructure );
+    info->beforeMarshal( wireFormat );
+    MessageMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
 
+    info->afterMarshal( wireFormat );
 }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ActiveMQBytesMessageMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ActiveMQBytesMessageMarshaller.h?view=diff&rev=508910&r1=508909&r2=508910
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ActiveMQBytesMessageMarshaller.h
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ActiveMQBytesMessageMarshaller.h
Sun Feb 18 08:08:58 2007
@@ -23,7 +23,7 @@
 #pragma warning( disable : 4290 )
 #endif
 
-#include <activemq/connector/openwire/marshal/v2/ActiveMQMessageMarshaller.h>
+#include <activemq/connector/openwire/marshal/v2/MessageMarshaller.h>
 
 #include <activemq/io/DataInputStream.h>
 #include <activemq/io/DataOutputStream.h>
@@ -45,7 +45,7 @@
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
-    class ActiveMQBytesMessageMarshaller : public ActiveMQMessageMarshaller
+    class ActiveMQBytesMessageMarshaller : public MessageMarshaller
     {
     public:
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ActiveMQMapMessageMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ActiveMQMapMessageMarshaller.cpp?view=diff&rev=508910&r1=508909&r2=508910
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ActiveMQMapMessageMarshaller.cpp
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ActiveMQMapMessageMarshaller.cpp
Sun Feb 18 08:08:58 2007
@@ -48,14 +48,24 @@
 ///////////////////////////////////////////////////////////////////////////////
 void ActiveMQMapMessageMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure*
dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( io::IOException ) {
 
-    ActiveMQMessageMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs );
+    MessageMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs );
 
+    ActiveMQMapMessage* info =
+        dynamic_cast<ActiveMQMapMessage*>( dataStructure );
+    info->beforeUnmarshal( wireFormat );
+
+
+    info->afterUnmarshal( wireFormat );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 int ActiveMQMapMessageMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure*
dataStructure, BooleanStream* bs ) throw( io::IOException ) {
 
-    int rc = ActiveMQMessageMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
+    ActiveMQMapMessage* info =
+        dynamic_cast<ActiveMQMapMessage*>( dataStructure );
+
+    info->beforeMarshal( wireFormat );
+    int rc = MessageMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
 
     return rc + 0;
 }
@@ -63,20 +73,31 @@
 ///////////////////////////////////////////////////////////////////////////////
 void ActiveMQMapMessageMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure*
dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( io::IOException ) {
 
-    ActiveMQMessageMarshaller::tightMarshal2( wireFormat, dataStructure, dataOut, bs );
+    MessageMarshaller::tightMarshal2( wireFormat, dataStructure, dataOut, bs );
 
+    ActiveMQMapMessage* info =
+        dynamic_cast<ActiveMQMapMessage*>( dataStructure );
+    info->afterMarshal( wireFormat );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 void ActiveMQMapMessageMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure*
dataStructure, DataInputStream* dataIn ) throw( io::IOException ) {
 
-    ActiveMQMessageMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
+    MessageMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
+    ActiveMQMapMessage* info =
+        dynamic_cast<ActiveMQMapMessage*>( dataStructure );
+    info->beforeUnmarshal( wireFormat );
+    info->afterUnmarshal( wireFormat );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 void ActiveMQMapMessageMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure*
dataStructure, DataOutputStream* dataOut ) throw( io::IOException ) {
 
-    ActiveMQMessageMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
+    ActiveMQMapMessage* info =
+        dynamic_cast<ActiveMQMapMessage*>( dataStructure );
+    info->beforeMarshal( wireFormat );
+    MessageMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
 
+    info->afterMarshal( wireFormat );
 }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ActiveMQMapMessageMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ActiveMQMapMessageMarshaller.h?view=diff&rev=508910&r1=508909&r2=508910
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ActiveMQMapMessageMarshaller.h
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ActiveMQMapMessageMarshaller.h
Sun Feb 18 08:08:58 2007
@@ -23,7 +23,7 @@
 #pragma warning( disable : 4290 )
 #endif
 
-#include <activemq/connector/openwire/marshal/v2/ActiveMQMessageMarshaller.h>
+#include <activemq/connector/openwire/marshal/v2/MessageMarshaller.h>
 
 #include <activemq/io/DataInputStream.h>
 #include <activemq/io/DataOutputStream.h>
@@ -45,7 +45,7 @@
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
-    class ActiveMQMapMessageMarshaller : public ActiveMQMessageMarshaller
+    class ActiveMQMapMessageMarshaller : public MessageMarshaller
     {
     public:
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ActiveMQObjectMessageMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ActiveMQObjectMessageMarshaller.cpp?view=diff&rev=508910&r1=508909&r2=508910
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ActiveMQObjectMessageMarshaller.cpp
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ActiveMQObjectMessageMarshaller.cpp
Sun Feb 18 08:08:58 2007
@@ -48,14 +48,24 @@
 ///////////////////////////////////////////////////////////////////////////////
 void ActiveMQObjectMessageMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure*
dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( io::IOException ) {
 
-    ActiveMQMessageMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs );
+    MessageMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs );
 
+    ActiveMQObjectMessage* info =
+        dynamic_cast<ActiveMQObjectMessage*>( dataStructure );
+    info->beforeUnmarshal( wireFormat );
+
+
+    info->afterUnmarshal( wireFormat );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 int ActiveMQObjectMessageMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure*
dataStructure, BooleanStream* bs ) throw( io::IOException ) {
 
-    int rc = ActiveMQMessageMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
+    ActiveMQObjectMessage* info =
+        dynamic_cast<ActiveMQObjectMessage*>( dataStructure );
+
+    info->beforeMarshal( wireFormat );
+    int rc = MessageMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
 
     return rc + 0;
 }
@@ -63,20 +73,31 @@
 ///////////////////////////////////////////////////////////////////////////////
 void ActiveMQObjectMessageMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure*
dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( io::IOException ) {
 
-    ActiveMQMessageMarshaller::tightMarshal2( wireFormat, dataStructure, dataOut, bs );
+    MessageMarshaller::tightMarshal2( wireFormat, dataStructure, dataOut, bs );
 
+    ActiveMQObjectMessage* info =
+        dynamic_cast<ActiveMQObjectMessage*>( dataStructure );
+    info->afterMarshal( wireFormat );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 void ActiveMQObjectMessageMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure*
dataStructure, DataInputStream* dataIn ) throw( io::IOException ) {
 
-    ActiveMQMessageMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
+    MessageMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
+    ActiveMQObjectMessage* info =
+        dynamic_cast<ActiveMQObjectMessage*>( dataStructure );
+    info->beforeUnmarshal( wireFormat );
+    info->afterUnmarshal( wireFormat );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 void ActiveMQObjectMessageMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure*
dataStructure, DataOutputStream* dataOut ) throw( io::IOException ) {
 
-    ActiveMQMessageMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
+    ActiveMQObjectMessage* info =
+        dynamic_cast<ActiveMQObjectMessage*>( dataStructure );
+    info->beforeMarshal( wireFormat );
+    MessageMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
 
+    info->afterMarshal( wireFormat );
 }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ActiveMQObjectMessageMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ActiveMQObjectMessageMarshaller.h?view=diff&rev=508910&r1=508909&r2=508910
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ActiveMQObjectMessageMarshaller.h
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ActiveMQObjectMessageMarshaller.h
Sun Feb 18 08:08:58 2007
@@ -23,7 +23,7 @@
 #pragma warning( disable : 4290 )
 #endif
 
-#include <activemq/connector/openwire/marshal/v2/ActiveMQMessageMarshaller.h>
+#include <activemq/connector/openwire/marshal/v2/MessageMarshaller.h>
 
 #include <activemq/io/DataInputStream.h>
 #include <activemq/io/DataOutputStream.h>
@@ -45,7 +45,7 @@
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
-    class ActiveMQObjectMessageMarshaller : public ActiveMQMessageMarshaller
+    class ActiveMQObjectMessageMarshaller : public MessageMarshaller
     {
     public:
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ActiveMQStreamMessageMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ActiveMQStreamMessageMarshaller.cpp?view=diff&rev=508910&r1=508909&r2=508910
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ActiveMQStreamMessageMarshaller.cpp
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ActiveMQStreamMessageMarshaller.cpp
Sun Feb 18 08:08:58 2007
@@ -48,14 +48,24 @@
 ///////////////////////////////////////////////////////////////////////////////
 void ActiveMQStreamMessageMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure*
dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( io::IOException ) {
 
-    ActiveMQMessageMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs );
+    MessageMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs );
 
+    ActiveMQStreamMessage* info =
+        dynamic_cast<ActiveMQStreamMessage*>( dataStructure );
+    info->beforeUnmarshal( wireFormat );
+
+
+    info->afterUnmarshal( wireFormat );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 int ActiveMQStreamMessageMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure*
dataStructure, BooleanStream* bs ) throw( io::IOException ) {
 
-    int rc = ActiveMQMessageMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
+    ActiveMQStreamMessage* info =
+        dynamic_cast<ActiveMQStreamMessage*>( dataStructure );
+
+    info->beforeMarshal( wireFormat );
+    int rc = MessageMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
 
     return rc + 0;
 }
@@ -63,20 +73,31 @@
 ///////////////////////////////////////////////////////////////////////////////
 void ActiveMQStreamMessageMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure*
dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( io::IOException ) {
 
-    ActiveMQMessageMarshaller::tightMarshal2( wireFormat, dataStructure, dataOut, bs );
+    MessageMarshaller::tightMarshal2( wireFormat, dataStructure, dataOut, bs );
 
+    ActiveMQStreamMessage* info =
+        dynamic_cast<ActiveMQStreamMessage*>( dataStructure );
+    info->afterMarshal( wireFormat );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 void ActiveMQStreamMessageMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure*
dataStructure, DataInputStream* dataIn ) throw( io::IOException ) {
 
-    ActiveMQMessageMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
+    MessageMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
+    ActiveMQStreamMessage* info =
+        dynamic_cast<ActiveMQStreamMessage*>( dataStructure );
+    info->beforeUnmarshal( wireFormat );
+    info->afterUnmarshal( wireFormat );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 void ActiveMQStreamMessageMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure*
dataStructure, DataOutputStream* dataOut ) throw( io::IOException ) {
 
-    ActiveMQMessageMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
+    ActiveMQStreamMessage* info =
+        dynamic_cast<ActiveMQStreamMessage*>( dataStructure );
+    info->beforeMarshal( wireFormat );
+    MessageMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
 
+    info->afterMarshal( wireFormat );
 }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ActiveMQStreamMessageMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ActiveMQStreamMessageMarshaller.h?view=diff&rev=508910&r1=508909&r2=508910
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ActiveMQStreamMessageMarshaller.h
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ActiveMQStreamMessageMarshaller.h
Sun Feb 18 08:08:58 2007
@@ -23,7 +23,7 @@
 #pragma warning( disable : 4290 )
 #endif
 
-#include <activemq/connector/openwire/marshal/v2/ActiveMQMessageMarshaller.h>
+#include <activemq/connector/openwire/marshal/v2/MessageMarshaller.h>
 
 #include <activemq/io/DataInputStream.h>
 #include <activemq/io/DataOutputStream.h>
@@ -45,7 +45,7 @@
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
-    class ActiveMQStreamMessageMarshaller : public ActiveMQMessageMarshaller
+    class ActiveMQStreamMessageMarshaller : public MessageMarshaller
     {
     public:
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTextMessageMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTextMessageMarshaller.cpp?view=diff&rev=508910&r1=508909&r2=508910
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTextMessageMarshaller.cpp
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTextMessageMarshaller.cpp
Sun Feb 18 08:08:58 2007
@@ -48,14 +48,24 @@
 ///////////////////////////////////////////////////////////////////////////////
 void ActiveMQTextMessageMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure*
dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( io::IOException ) {
 
-    ActiveMQMessageMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs );
+    MessageMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs );
 
+    ActiveMQTextMessage* info =
+        dynamic_cast<ActiveMQTextMessage*>( dataStructure );
+    info->beforeUnmarshal( wireFormat );
+
+
+    info->afterUnmarshal( wireFormat );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 int ActiveMQTextMessageMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure*
dataStructure, BooleanStream* bs ) throw( io::IOException ) {
 
-    int rc = ActiveMQMessageMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
+    ActiveMQTextMessage* info =
+        dynamic_cast<ActiveMQTextMessage*>( dataStructure );
+
+    info->beforeMarshal( wireFormat );
+    int rc = MessageMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
 
     return rc + 0;
 }
@@ -63,20 +73,31 @@
 ///////////////////////////////////////////////////////////////////////////////
 void ActiveMQTextMessageMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure*
dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( io::IOException ) {
 
-    ActiveMQMessageMarshaller::tightMarshal2( wireFormat, dataStructure, dataOut, bs );
+    MessageMarshaller::tightMarshal2( wireFormat, dataStructure, dataOut, bs );
 
+    ActiveMQTextMessage* info =
+        dynamic_cast<ActiveMQTextMessage*>( dataStructure );
+    info->afterMarshal( wireFormat );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 void ActiveMQTextMessageMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure*
dataStructure, DataInputStream* dataIn ) throw( io::IOException ) {
 
-    ActiveMQMessageMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
+    MessageMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
+    ActiveMQTextMessage* info =
+        dynamic_cast<ActiveMQTextMessage*>( dataStructure );
+    info->beforeUnmarshal( wireFormat );
+    info->afterUnmarshal( wireFormat );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 void ActiveMQTextMessageMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure*
dataStructure, DataOutputStream* dataOut ) throw( io::IOException ) {
 
-    ActiveMQMessageMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
+    ActiveMQTextMessage* info =
+        dynamic_cast<ActiveMQTextMessage*>( dataStructure );
+    info->beforeMarshal( wireFormat );
+    MessageMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
 
+    info->afterMarshal( wireFormat );
 }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTextMessageMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTextMessageMarshaller.h?view=diff&rev=508910&r1=508909&r2=508910
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTextMessageMarshaller.h
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTextMessageMarshaller.h
Sun Feb 18 08:08:58 2007
@@ -23,7 +23,7 @@
 #pragma warning( disable : 4290 )
 #endif
 
-#include <activemq/connector/openwire/marshal/v2/ActiveMQMessageMarshaller.h>
+#include <activemq/connector/openwire/marshal/v2/MessageMarshaller.h>
 
 #include <activemq/io/DataInputStream.h>
 #include <activemq/io/DataOutputStream.h>
@@ -45,7 +45,7 @@
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
-    class ActiveMQTextMessageMarshaller : public ActiveMQMessageMarshaller
+    class ActiveMQTextMessageMarshaller : public MessageMarshaller
     {
     public:
 



Mime
View raw message