activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r756161 - in /activemq/activemq-cpp/trunk/src/main/activemq: util/ wireformat/openwire/marshal/v1/ wireformat/openwire/marshal/v2/ wireformat/openwire/marshal/v3/
Date Thu, 19 Mar 2009 20:10:08 GMT
Author: tabish
Date: Thu Mar 19 20:10:08 2009
New Revision: 756161

URL: http://svn.apache.org/viewvc?rev=756161&view=rev
Log:
Fix some issues found when testing on Windows

Modified:
    activemq/activemq-cpp/trunk/src/main/activemq/util/URISupport.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQBlobMessageMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQBlobMessageMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ActiveMQBlobMessageMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ActiveMQBlobMessageMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v3/ActiveMQBlobMessageMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v3/ActiveMQBlobMessageMarshaller.h

Modified: activemq/activemq-cpp/trunk/src/main/activemq/util/URISupport.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/util/URISupport.cpp?rev=756161&r1=756160&r2=756161&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/util/URISupport.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/util/URISupport.cpp Thu Mar 19 20:10:08
2009
@@ -287,12 +287,12 @@
             uri.toString() );
     }
 
-	std::size_t p;
-	std::size_t intialParen = ssp.find( "(" );
+    std::size_t p;
+    std::size_t intialParen = ssp.find( "(" );
     if( intialParen == 0 ) {
         rc.setHost( ssp.substr( 0, intialParen ) );
         p = rc.getHost().find( "/" );
-        if( p >= 0 ) {
+        if( p != string::npos ) {
             rc.setPath( rc.getHost().substr( p ) );
             rc.setHost( rc.getHost().substr( 0, p ) );
         }

Modified: activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQBlobMessageMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQBlobMessageMarshaller.cpp?rev=756161&r1=756160&r2=756161&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQBlobMessageMarshaller.cpp
(original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQBlobMessageMarshaller.cpp
Thu Mar 19 20:10:08 2009
@@ -55,7 +55,7 @@
 
     try {
 
-        ActiveMQMessageMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs
);
+        MessageMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs );
 
         ActiveMQBlobMessage* info =
             dynamic_cast<ActiveMQBlobMessage*>( dataStructure );
@@ -76,7 +76,7 @@
         ActiveMQBlobMessage* info =
             dynamic_cast<ActiveMQBlobMessage*>( dataStructure );
 
-        int rc = ActiveMQMessageMarshaller::tightMarshal1( wireFormat, dataStructure, bs
);
+        int rc = MessageMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
         rc += tightMarshalString1( info->getRemoteBlobUrl(), bs );
         rc += tightMarshalString1( info->getMimeType(), bs );
         bs->writeBoolean( info->isDeletedByBroker() );
@@ -93,7 +93,7 @@
 
     try {
 
-        ActiveMQMessageMarshaller::tightMarshal2( wireFormat, dataStructure, dataOut, bs
);
+        MessageMarshaller::tightMarshal2( wireFormat, dataStructure, dataOut, bs );
 
         ActiveMQBlobMessage* info =
             dynamic_cast<ActiveMQBlobMessage*>( dataStructure );
@@ -111,7 +111,7 @@
 
     try {
 
-        ActiveMQMessageMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
+        MessageMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
         ActiveMQBlobMessage* info =
             dynamic_cast<ActiveMQBlobMessage*>( dataStructure );
         info->setRemoteBlobUrl( looseUnmarshalString( dataIn ) );
@@ -130,7 +130,7 @@
 
         ActiveMQBlobMessage* info =
             dynamic_cast<ActiveMQBlobMessage*>( dataStructure );
-        ActiveMQMessageMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
+        MessageMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
 
         looseMarshalString( info->getRemoteBlobUrl(), dataOut );
         looseMarshalString( info->getMimeType(), dataOut );

Modified: activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQBlobMessageMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQBlobMessageMarshaller.h?rev=756161&r1=756160&r2=756161&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQBlobMessageMarshaller.h
(original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQBlobMessageMarshaller.h
Thu Mar 19 20:10:08 2009
@@ -23,7 +23,7 @@
 #pragma warning( disable : 4290 )
 #endif
 
-#include <activemq/wireformat/openwire/marshal/v1/ActiveMQMessageMarshaller.h>
+#include <activemq/wireformat/openwire/marshal/v1/MessageMarshaller.h>
 
 #include <decaf/io/DataInputStream.h>
 #include <decaf/io/DataOutputStream.h>
@@ -46,7 +46,7 @@
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
-    class AMQCPP_API ActiveMQBlobMessageMarshaller : public ActiveMQMessageMarshaller {
+    class AMQCPP_API ActiveMQBlobMessageMarshaller : public MessageMarshaller {
     public:
 
         ActiveMQBlobMessageMarshaller() {}

Modified: activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ActiveMQBlobMessageMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ActiveMQBlobMessageMarshaller.cpp?rev=756161&r1=756160&r2=756161&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ActiveMQBlobMessageMarshaller.cpp
(original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ActiveMQBlobMessageMarshaller.cpp
Thu Mar 19 20:10:08 2009
@@ -55,7 +55,7 @@
 
     try {
 
-        ActiveMQMessageMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs
);
+        MessageMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs );
 
         ActiveMQBlobMessage* info =
             dynamic_cast<ActiveMQBlobMessage*>( dataStructure );
@@ -76,7 +76,7 @@
         ActiveMQBlobMessage* info =
             dynamic_cast<ActiveMQBlobMessage*>( dataStructure );
 
-        int rc = ActiveMQMessageMarshaller::tightMarshal1( wireFormat, dataStructure, bs
);
+        int rc = MessageMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
         rc += tightMarshalString1( info->getRemoteBlobUrl(), bs );
         rc += tightMarshalString1( info->getMimeType(), bs );
         bs->writeBoolean( info->isDeletedByBroker() );
@@ -93,7 +93,7 @@
 
     try {
 
-        ActiveMQMessageMarshaller::tightMarshal2( wireFormat, dataStructure, dataOut, bs
);
+        MessageMarshaller::tightMarshal2( wireFormat, dataStructure, dataOut, bs );
 
         ActiveMQBlobMessage* info =
             dynamic_cast<ActiveMQBlobMessage*>( dataStructure );
@@ -111,7 +111,7 @@
 
     try {
 
-        ActiveMQMessageMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
+        MessageMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
         ActiveMQBlobMessage* info =
             dynamic_cast<ActiveMQBlobMessage*>( dataStructure );
         info->setRemoteBlobUrl( looseUnmarshalString( dataIn ) );
@@ -130,7 +130,7 @@
 
         ActiveMQBlobMessage* info =
             dynamic_cast<ActiveMQBlobMessage*>( dataStructure );
-        ActiveMQMessageMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
+        MessageMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
 
         looseMarshalString( info->getRemoteBlobUrl(), dataOut );
         looseMarshalString( info->getMimeType(), dataOut );

Modified: activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ActiveMQBlobMessageMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ActiveMQBlobMessageMarshaller.h?rev=756161&r1=756160&r2=756161&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ActiveMQBlobMessageMarshaller.h
(original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ActiveMQBlobMessageMarshaller.h
Thu Mar 19 20:10:08 2009
@@ -23,7 +23,7 @@
 #pragma warning( disable : 4290 )
 #endif
 
-#include <activemq/wireformat/openwire/marshal/v2/ActiveMQMessageMarshaller.h>
+#include <activemq/wireformat/openwire/marshal/v2/MessageMarshaller.h>
 
 #include <decaf/io/DataInputStream.h>
 #include <decaf/io/DataOutputStream.h>
@@ -46,7 +46,7 @@
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
-    class AMQCPP_API ActiveMQBlobMessageMarshaller : public ActiveMQMessageMarshaller {
+    class AMQCPP_API ActiveMQBlobMessageMarshaller : public MessageMarshaller {
     public:
 
         ActiveMQBlobMessageMarshaller() {}

Modified: activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v3/ActiveMQBlobMessageMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v3/ActiveMQBlobMessageMarshaller.cpp?rev=756161&r1=756160&r2=756161&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v3/ActiveMQBlobMessageMarshaller.cpp
(original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v3/ActiveMQBlobMessageMarshaller.cpp
Thu Mar 19 20:10:08 2009
@@ -55,7 +55,7 @@
 
     try {
 
-        ActiveMQMessageMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs
);
+        MessageMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs );
 
         ActiveMQBlobMessage* info =
             dynamic_cast<ActiveMQBlobMessage*>( dataStructure );
@@ -76,7 +76,7 @@
         ActiveMQBlobMessage* info =
             dynamic_cast<ActiveMQBlobMessage*>( dataStructure );
 
-        int rc = ActiveMQMessageMarshaller::tightMarshal1( wireFormat, dataStructure, bs
);
+        int rc = MessageMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
         rc += tightMarshalString1( info->getRemoteBlobUrl(), bs );
         rc += tightMarshalString1( info->getMimeType(), bs );
         bs->writeBoolean( info->isDeletedByBroker() );
@@ -93,7 +93,7 @@
 
     try {
 
-        ActiveMQMessageMarshaller::tightMarshal2( wireFormat, dataStructure, dataOut, bs
);
+        MessageMarshaller::tightMarshal2( wireFormat, dataStructure, dataOut, bs );
 
         ActiveMQBlobMessage* info =
             dynamic_cast<ActiveMQBlobMessage*>( dataStructure );
@@ -111,7 +111,7 @@
 
     try {
 
-        ActiveMQMessageMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
+        MessageMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
         ActiveMQBlobMessage* info =
             dynamic_cast<ActiveMQBlobMessage*>( dataStructure );
         info->setRemoteBlobUrl( looseUnmarshalString( dataIn ) );
@@ -130,7 +130,7 @@
 
         ActiveMQBlobMessage* info =
             dynamic_cast<ActiveMQBlobMessage*>( dataStructure );
-        ActiveMQMessageMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
+        MessageMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
 
         looseMarshalString( info->getRemoteBlobUrl(), dataOut );
         looseMarshalString( info->getMimeType(), dataOut );

Modified: activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v3/ActiveMQBlobMessageMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v3/ActiveMQBlobMessageMarshaller.h?rev=756161&r1=756160&r2=756161&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v3/ActiveMQBlobMessageMarshaller.h
(original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v3/ActiveMQBlobMessageMarshaller.h
Thu Mar 19 20:10:08 2009
@@ -23,7 +23,7 @@
 #pragma warning( disable : 4290 )
 #endif
 
-#include <activemq/wireformat/openwire/marshal/v3/ActiveMQMessageMarshaller.h>
+#include <activemq/wireformat/openwire/marshal/v3/MessageMarshaller.h>
 
 #include <decaf/io/DataInputStream.h>
 #include <decaf/io/DataOutputStream.h>
@@ -46,7 +46,7 @@
      *         if you need to make a change, please see the Java Classes
      *         in the activemq-openwire-generator module
      */
-    class AMQCPP_API ActiveMQBlobMessageMarshaller : public ActiveMQMessageMarshaller {
+    class AMQCPP_API ActiveMQBlobMessageMarshaller : public MessageMarshaller {
     public:
 
         ActiveMQBlobMessageMarshaller() {}



Mime
View raw message