From d92c5008e443f804fe3e0a3db3c24f106f452b43 Mon Sep 17 00:00:00 2001
Message-Id: <d92c5008e443f804fe3e0a3db3c24f106f452b43.1348732807.git.ibell@...>
In-Reply-To: <b3579c20edd49597fd58e530be463611e61515f0.1348732807.git.ibell@...>
References: <b3579c20edd49597fd58e530be463611e61515f0.1348732807.git.ibell@...>
From: Ian Bell <ibell@...>
Date: Thu, 27 Sep 2012 08:59:58 +0100
Subject: [PATCH 4/4] [mama] CPP subscirption parameters
MOdified parameter removal so that information is available in the
onDestroy callback.
Signed-off-by: Ian Bell <ibell@...>
---
mama/c_cpp/src/cpp/MamaBasicSubscription.cpp | 6 ------
mama/c_cpp/src/cpp/MamaSubscription.cpp | 5 +++++
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/mama/c_cpp/src/cpp/MamaBasicSubscription.cpp b/mama/c_cpp/src/cpp/MamaBasicSubscription.cpp
index 3b8ac8f..a12f4e1 100644
--- a/mama/c_cpp/src/cpp/MamaBasicSubscription.cpp
+++ b/mama/c_cpp/src/cpp/MamaBasicSubscription.cpp
@@ -349,9 +349,6 @@ void MamaBasicSubscription::destroy(void)
* during any of the callbacks.
*/
mCallback = NULL;
- mClosure = NULL;
- mQueue = NULL;
- mTransport = NULL;
}
}
@@ -367,9 +364,6 @@ void MamaBasicSubscription::destroyEx(void)
* during any of the callbacks.
*/
mCallback = NULL;
- mClosure = NULL;
- mQueue = NULL;
- mTransport = NULL;
}
}
diff --git a/mama/c_cpp/src/cpp/MamaSubscription.cpp b/mama/c_cpp/src/cpp/MamaSubscription.cpp
index 2717bcc..952095f 100644
--- a/mama/c_cpp/src/cpp/MamaSubscription.cpp
+++ b/mama/c_cpp/src/cpp/MamaSubscription.cpp
@@ -520,6 +520,8 @@ namespace Wombat
mCallback = callback;
mClosure = closure;
+ // Save the queue so that calls to MamaBasicSubscription->getQueue () work
+ mQueue = queue;
// Create a new impl
MamaSubscriptionImpl *impl = new MamaSubscriptionImpl (callback, closure, this);
@@ -572,6 +574,9 @@ namespace Wombat
mCallback = callback;
mClosure = closure;
+ // Save the queue so that calls to MamaBasicSubscription->getQueue () work
+ mQueue = queue;
+
// Create the source derivative
if (NULL == mSourceDeriv)
{
--
1.7.9.5
