svn commit: r750265 - in /activemq/activemq-cpp/trunk/src/main/activemq/transport: AbstractTransportFactory.cpp failover/ReconnectTask.cpp mock/MockTransportFactory.cpp

[tabish]

Author: tabish
Date: Thu Mar  5 01:04:06 2009
New Revision: 750265

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

Fix a couple more errors.

Modified:
    
activemq/activemq-cpp/trunk/src/main/activemq/transport/AbstractTransportFactory.cpp
    
activemq/activemq-cpp/trunk/src/main/activemq/transport/failover/ReconnectTask.cpp
    
activemq/activemq-cpp/trunk/src/main/activemq/transport/mock/MockTransportFactory.cpp

Modified: 
activemq/activemq-cpp/trunk/src/main/activemq/transport/AbstractTransportFactory.cpp
URL: 
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/transport/AbstractTransportFactory.cpp?rev=750265&r1=750264&r2=750265&view=diff
==============================================================================
--- 
activemq/activemq-cpp/trunk/src/main/activemq/transport/AbstractTransportFactory.cpp
 (original)
+++ 
activemq/activemq-cpp/trunk/src/main/activemq/transport/AbstractTransportFactory.cpp
 Thu Mar  5 01:04:06 2009
@@ -87,11 +87,6 @@
         // Create the initial Transport, then wrap it in the normal Filters
         Pointer<Transport> transport( doCreateComposite( location, wireFormat, 
properties ) );
 
-        // If there is a negotiator need then we create and wrap here.
-        if( wireFormat->hasNegotiator() ) {
-            transport = wireFormat->createNegotiator( transport );
-        }
-
         return transport;
     }
     AMQ_CATCH_RETHROW( ActiveMQException )

Modified: 
activemq/activemq-cpp/trunk/src/main/activemq/transport/failover/ReconnectTask.cpp
URL: 
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/transport/failover/ReconnectTask.cpp?rev=750265&r1=750264&r2=750265&view=diff
==============================================================================
--- 
activemq/activemq-cpp/trunk/src/main/activemq/transport/failover/ReconnectTask.cpp
 (original)
+++ 
activemq/activemq-cpp/trunk/src/main/activemq/transport/failover/ReconnectTask.cpp
 Thu Mar  5 01:04:06 2009
@@ -41,7 +41,7 @@
     this->pending = false;
     this->shutDown = false;
 
-    //this->start();
+    this->start();
 }
 
 
////////////////////////////////////////////////////////////////////////////////

Modified: 
activemq/activemq-cpp/trunk/src/main/activemq/transport/mock/MockTransportFactory.cpp
URL: 
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/transport/mock/MockTransportFactory.cpp?rev=750265&r1=750264&r2=750265&view=diff
==============================================================================
--- 
activemq/activemq-cpp/trunk/src/main/activemq/transport/mock/MockTransportFactory.cpp
 (original)
+++ 
activemq/activemq-cpp/trunk/src/main/activemq/transport/mock/MockTransportFactory.cpp
 Thu Mar  5 01:04:06 2009
@@ -39,7 +39,7 @@
     try {
 
         std::string wireFormatName =
-            properties.getProperty( "wireFormat", "stomp" );
+            properties.getProperty( "wireFormat", "openwire" );
 
         Pointer<MockTransport::ResponseBuilder> builder;