You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by gs...@apache.org on 2012/08/09 19:15:16 UTC
svn commit: r1371320 - in /qpid/trunk/qpid/cpp:
include/qpid/client/SubscriptionManager.h
src/qpid/client/SubscriptionManagerImpl.cpp
Author: gsim
Date: Thu Aug 9 17:15:15 2012
New Revision: 1371320
URL: http://svn.apache.org/viewvc?rev=1371320&view=rev
Log:
QPID-4200: Add exception handling to qpid::client::AutoCancel destructor
Modified:
qpid/trunk/qpid/cpp/include/qpid/client/SubscriptionManager.h
qpid/trunk/qpid/cpp/src/qpid/client/SubscriptionManagerImpl.cpp
Modified: qpid/trunk/qpid/cpp/include/qpid/client/SubscriptionManager.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/client/SubscriptionManager.h?rev=1371320&r1=1371319&r2=1371320&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/include/qpid/client/SubscriptionManager.h (original)
+++ qpid/trunk/qpid/cpp/include/qpid/client/SubscriptionManager.h Thu Aug 9 17:15:15 2012
@@ -280,8 +280,8 @@ class QPID_CLIENT_CLASS_EXTERN Subscript
/** AutoCancel cancels a subscription in its destructor */
class AutoCancel {
public:
- AutoCancel(SubscriptionManager& sm_, const std::string& tag_) : sm(sm_), tag(tag_) {}
- ~AutoCancel() { sm.cancel(tag); }
+ AutoCancel(SubscriptionManager&, const std::string& tag);
+ ~AutoCancel();
private:
SubscriptionManager& sm;
std::string tag;
Modified: qpid/trunk/qpid/cpp/src/qpid/client/SubscriptionManagerImpl.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/SubscriptionManagerImpl.cpp?rev=1371320&r1=1371319&r2=1371320&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/SubscriptionManagerImpl.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/SubscriptionManagerImpl.cpp Thu Aug 9 17:15:15 2012
@@ -28,6 +28,7 @@
#include <qpid/client/Session.h>
#include <qpid/client/MessageListener.h>
#include <qpid/framing/Uuid.h>
+#include <qpid/log/Statement.h>
#include <set>
#include <sstream>
@@ -167,6 +168,15 @@ void SubscriptionManagerImpl::setFlowCon
setFlowControl(name, FlowControl(messages, bytes, window));
}
+AutoCancel::AutoCancel(SubscriptionManager& sm_, const std::string& tag_) : sm(sm_), tag(tag_) {}
+AutoCancel::~AutoCancel() {
+ try {
+ sm.cancel(tag);
+ } catch (const qpid::Exception& e) {
+ QPID_LOG(info, "Exception in AutoCancel destructor: " << e.what());
+ }
+}
+
}} // namespace qpid::client
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org