activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r1050423 - in /activemq/activemq-cpp/branches/activemq-cpp-3.2.x/activemq-cpp/src/main/activemq/transport: TransportFilter.cpp correlator/ResponseCorrelator.cpp tcp/TcpTransport.cpp
Date Fri, 17 Dec 2010 15:28:40 GMT
Author: tabish
Date: Fri Dec 17 15:28:39 2010
New Revision: 1050423

URL: http://svn.apache.org/viewvc?rev=1050423&view=rev
Log:
Some changes to help address: https://issues.apache.org/jira/browse/AMQCPP-328

Modified:
    activemq/activemq-cpp/branches/activemq-cpp-3.2.x/activemq-cpp/src/main/activemq/transport/TransportFilter.cpp
    activemq/activemq-cpp/branches/activemq-cpp-3.2.x/activemq-cpp/src/main/activemq/transport/correlator/ResponseCorrelator.cpp
    activemq/activemq-cpp/branches/activemq-cpp-3.2.x/activemq-cpp/src/main/activemq/transport/tcp/TcpTransport.cpp

Modified: activemq/activemq-cpp/branches/activemq-cpp-3.2.x/activemq-cpp/src/main/activemq/transport/TransportFilter.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/branches/activemq-cpp-3.2.x/activemq-cpp/src/main/activemq/transport/TransportFilter.cpp?rev=1050423&r1=1050422&r2=1050423&view=diff
==============================================================================
--- activemq/activemq-cpp/branches/activemq-cpp-3.2.x/activemq-cpp/src/main/activemq/transport/TransportFilter.cpp
(original)
+++ activemq/activemq-cpp/branches/activemq-cpp-3.2.x/activemq-cpp/src/main/activemq/transport/TransportFilter.cpp
Fri Dec 17 15:28:39 2010
@@ -99,7 +99,6 @@ void TransportFilter::close() throw( dec
 
     if( next != NULL ) {
         next->close();
-        next.reset( NULL );
     }
 }
 

Modified: activemq/activemq-cpp/branches/activemq-cpp-3.2.x/activemq-cpp/src/main/activemq/transport/correlator/ResponseCorrelator.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/branches/activemq-cpp-3.2.x/activemq-cpp/src/main/activemq/transport/correlator/ResponseCorrelator.cpp?rev=1050423&r1=1050422&r2=1050423&view=diff
==============================================================================
--- activemq/activemq-cpp/branches/activemq-cpp-3.2.x/activemq-cpp/src/main/activemq/transport/correlator/ResponseCorrelator.cpp
(original)
+++ activemq/activemq-cpp/branches/activemq-cpp-3.2.x/activemq-cpp/src/main/activemq/transport/correlator/ResponseCorrelator.cpp
Fri Dec 17 15:28:39 2010
@@ -62,8 +62,11 @@ ResponseCorrelator::ResponseCorrelator( 
 ////////////////////////////////////////////////////////////////////////////////
 ResponseCorrelator::~ResponseCorrelator(){
 
-    // Close the transport and destroy it.
-    close();
+    try{
+        // Close the transport and destroy it.
+        close();
+    }
+    AMQ_CATCHALL_NOTHROW()
 }
 
 ////////////////////////////////////////////////////////////////////////////////

Modified: activemq/activemq-cpp/branches/activemq-cpp-3.2.x/activemq-cpp/src/main/activemq/transport/tcp/TcpTransport.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/branches/activemq-cpp-3.2.x/activemq-cpp/src/main/activemq/transport/tcp/TcpTransport.cpp?rev=1050423&r1=1050422&r2=1050423&view=diff
==============================================================================
--- activemq/activemq-cpp/branches/activemq-cpp-3.2.x/activemq-cpp/src/main/activemq/transport/tcp/TcpTransport.cpp
(original)
+++ activemq/activemq-cpp/branches/activemq-cpp-3.2.x/activemq-cpp/src/main/activemq/transport/tcp/TcpTransport.cpp
Fri Dec 17 15:28:39 2010
@@ -70,7 +70,6 @@ void TcpTransport::close() throw( decaf:
             socket->close();
         }
 
-        // Invoke the paren't close first.
         TransportFilter::close();
     }
     AMQ_CATCH_RETHROW( IOException )



Mime
View raw message