activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r533708 - in /activemq/activemq-cpp/tags/activemq-cpp-2.0.1/src/main/activemq/connector/openwire: ./ commands/
Date Mon, 30 Apr 2007 11:42:19 GMT
Author: tabish
Date: Mon Apr 30 04:42:18 2007
New Revision: 533708

URL: http://svn.apache.org/viewvc?view=rev&rev=533708
Log:
Merging in fixes for 2.0.1

Modified:
    activemq/activemq-cpp/tags/activemq-cpp-2.0.1/src/main/activemq/connector/openwire/OpenWireFormatNegotiator.cpp
    activemq/activemq-cpp/tags/activemq-cpp-2.0.1/src/main/activemq/connector/openwire/OpenWireFormatNegotiator.h
    activemq/activemq-cpp/tags/activemq-cpp-2.0.1/src/main/activemq/connector/openwire/commands/ActiveMQDestination.cpp
    activemq/activemq-cpp/tags/activemq-cpp-2.0.1/src/main/activemq/connector/openwire/commands/ActiveMQMessageBase.h
    activemq/activemq-cpp/tags/activemq-cpp-2.0.1/src/main/activemq/connector/openwire/commands/WireFormatInfo.cpp

Modified: activemq/activemq-cpp/tags/activemq-cpp-2.0.1/src/main/activemq/connector/openwire/OpenWireFormatNegotiator.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/tags/activemq-cpp-2.0.1/src/main/activemq/connector/openwire/OpenWireFormatNegotiator.cpp?view=diff&rev=533708&r1=533707&r2=533708
==============================================================================
--- activemq/activemq-cpp/tags/activemq-cpp-2.0.1/src/main/activemq/connector/openwire/OpenWireFormatNegotiator.cpp
(original)
+++ activemq/activemq-cpp/tags/activemq-cpp-2.0.1/src/main/activemq/connector/openwire/OpenWireFormatNegotiator.cpp
Mon Apr 30 04:42:18 2007
@@ -32,7 +32,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 OpenWireFormatNegotiator::OpenWireFormatNegotiator( OpenWireFormat* openWireFormat,
                                                     Transport* next,
-                                                    const bool own ) :
+                                                    bool own ) :
     TransportFilter( next, own ),
     wireInfoSentDownLatch(1),
     readyCountDownLatch(1)

Modified: activemq/activemq-cpp/tags/activemq-cpp-2.0.1/src/main/activemq/connector/openwire/OpenWireFormatNegotiator.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/tags/activemq-cpp-2.0.1/src/main/activemq/connector/openwire/OpenWireFormatNegotiator.h?view=diff&rev=533708&r1=533707&r2=533708
==============================================================================
--- activemq/activemq-cpp/tags/activemq-cpp-2.0.1/src/main/activemq/connector/openwire/OpenWireFormatNegotiator.h
(original)
+++ activemq/activemq-cpp/tags/activemq-cpp-2.0.1/src/main/activemq/connector/openwire/OpenWireFormatNegotiator.h
Mon Apr 30 04:42:18 2007
@@ -29,8 +29,7 @@
 namespace connector{
 namespace openwire{
 
-    class OpenWireFormatNegotiator : public transport::TransportFilter
-    {
+    class OpenWireFormatNegotiator : public transport::TransportFilter {
     private:
 
         /**
@@ -69,7 +68,7 @@
          */
         OpenWireFormatNegotiator( OpenWireFormat* openWireFormat,
                                   transport::Transport* next,
-                                  const bool own = true );
+                                  bool own = true );
 
         virtual ~OpenWireFormatNegotiator();
 

Modified: activemq/activemq-cpp/tags/activemq-cpp-2.0.1/src/main/activemq/connector/openwire/commands/ActiveMQDestination.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/tags/activemq-cpp-2.0.1/src/main/activemq/connector/openwire/commands/ActiveMQDestination.cpp?view=diff&rev=533708&r1=533707&r2=533708
==============================================================================
--- activemq/activemq-cpp/tags/activemq-cpp-2.0.1/src/main/activemq/connector/openwire/commands/ActiveMQDestination.cpp
(original)
+++ activemq/activemq-cpp/tags/activemq-cpp-2.0.1/src/main/activemq/connector/openwire/commands/ActiveMQDestination.cpp
Mon Apr 30 04:42:18 2007
@@ -98,6 +98,7 @@
     this->setOrdered( srcPtr->isOrdered() );
     this->setExclusive( srcPtr->isExclusive() );
     this->setOrderedTarget( srcPtr->getOrderedTarget() );
+    this->options.copy( &srcPtr->getOptions() );
 }
 
 ////////////////////////////////////////////////////////////////////////////////

Modified: activemq/activemq-cpp/tags/activemq-cpp-2.0.1/src/main/activemq/connector/openwire/commands/ActiveMQMessageBase.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/tags/activemq-cpp-2.0.1/src/main/activemq/connector/openwire/commands/ActiveMQMessageBase.h?view=diff&rev=533708&r1=533707&r2=533708
==============================================================================
--- activemq/activemq-cpp/tags/activemq-cpp-2.0.1/src/main/activemq/connector/openwire/commands/ActiveMQMessageBase.h
(original)
+++ activemq/activemq-cpp/tags/activemq-cpp-2.0.1/src/main/activemq/connector/openwire/commands/ActiveMQMessageBase.h
Mon Apr 30 04:42:18 2007
@@ -25,6 +25,7 @@
 #include <activemq/core/ActiveMQAckHandler.h>
 #include <activemq/util/Date.h>
 #include <activemq/util/PrimitiveMap.h>
+#include <cms/DeliveryMode.h>
 
 namespace activemq{
 namespace connector{
@@ -57,13 +58,13 @@
          * @return src - Source Object
          */
         virtual void copyDataStructure( const DataStructure* src ) {
-            const ActiveMQMessageBase<T>* message = 
+            const ActiveMQMessageBase<T>* message =
                 dynamic_cast< const ActiveMQMessageBase<T>* >( src );
-            
+
             this->properties.copy( message->properties );
             this->setAckHandler( message->getAckHandler() );
             this->setRedeliveryCount( message->getRedeliveryCount() );
-            
+
             openwire::commands::Message::copyDataStructure( src );
         }
 
@@ -497,7 +498,7 @@
          * @param mode - DeliveryMode enumerated value.
          */
         virtual void setCMSDeliveryMode( int mode ) {
-            this->setPersistent( mode != 0 );
+            this->setPersistent( mode == (int)cms::DeliveryMode::PERSISTENT );
         }
 
         /**

Modified: activemq/activemq-cpp/tags/activemq-cpp-2.0.1/src/main/activemq/connector/openwire/commands/WireFormatInfo.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/tags/activemq-cpp-2.0.1/src/main/activemq/connector/openwire/commands/WireFormatInfo.cpp?view=diff&rev=533708&r1=533707&r2=533708
==============================================================================
--- activemq/activemq-cpp/tags/activemq-cpp-2.0.1/src/main/activemq/connector/openwire/commands/WireFormatInfo.cpp
(original)
+++ activemq/activemq-cpp/tags/activemq-cpp-2.0.1/src/main/activemq/connector/openwire/commands/WireFormatInfo.cpp
Mon Apr 30 04:42:18 2007
@@ -71,6 +71,9 @@
             __FILE__, __LINE__,
             "WireFormatInfo::copyDataStructure - src is NULL or invalid" );
     }
+
+    this->properties.copy( srcPtr->getProperties() );
+    this->version = srcPtr->getVersion();
 }
 
 ////////////////////////////////////////////////////////////////////////////////



Mime
View raw message