activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r1445966 - /activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnection.cpp
Date Wed, 13 Feb 2013 22:53:30 GMT
Author: tabish
Date: Wed Feb 13 22:53:30 2013
New Revision: 1445966

URL: http://svn.apache.org/r1445966
Log:
additional fixes for: https://issues.apache.org/jira/browse/AMQCPP-460

Modified:
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnection.cpp

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnection.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnection.cpp?rev=1445966&r1=1445965&r2=1445966&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnection.cpp
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnection.cpp
Wed Feb 13 22:53:30 2013
@@ -648,7 +648,7 @@ void ActiveMQConnection::close() {
                 this->stop();
             } catch (cms::CMSException& error) {
                 if (!hasException) {
-                    ex = Exception(&error);
+                    ex = Exception(new CMSException(error));
                     ex.setMark(__FILE__, __LINE__);
                     hasException = true;
                 }
@@ -713,13 +713,7 @@ void ActiveMQConnection::close() {
             }
         } catch (cms::CMSException& error) {
             if (!hasException) {
-                ex = Exception(&error);
-                ex.setMark(__FILE__, __LINE__);
-                hasException = true;
-            }
-        } catch (std::exception& stdex) {
-            if (!hasException) {
-                ex = Exception(&stdex);
+                ex = Exception(new CMSException(error));
                 ex.setMark(__FILE__, __LINE__);
                 hasException = true;
             }



Mime
View raw message