From 0487c0c7c7101e484418306b80017a26822f1b23 Mon Sep 17 00:00:00 2001
Message-Id: <0487c0c7c7101e484418306b80017a26822f1b23.1348657454.git.ibell@...>
In-Reply-To: <6456222f7ea01be922ce869d84b615bcc03cc79c.1348657454.git.ibell@...>
References: <6456222f7ea01be922ce869d84b615bcc03cc79c.1348657454.git.ibell@...>
From: Ian Bell <ibell@...>
Date: Wed, 26 Sep 2012 11:59:26 +0100
Subject: [PATCH 6/6] [mama] Moved IssueSymbol delete
delayed the delete of the IssueSymbol in a subscirption so that it
is available during the onDestroy callback.
Signed-off-by: Ian Bell <ibell@...>
---
mama/c_cpp/src/c/subscription.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/mama/c_cpp/src/c/subscription.c b/mama/c_cpp/src/c/subscription.c
index a13e499..b3f814c 100644
--- a/mama/c_cpp/src/c/subscription.c
+++ b/mama/c_cpp/src/c/subscription.c
@@ -1470,12 +1470,6 @@ void mamaSubscriptionImpl_cleanup(mamaSubscriptionImpl *impl)
impl->mUserSymbol = NULL;
}
- /* The subscription symbol. */
- if(NULL != impl->mSubscSymbol)
- {
- free(impl->mSubscSymbol);
- impl->mSubscSymbol = NULL;
- }
}
@@ -1834,6 +1828,12 @@ void mamaSubscriptionImpl_deallocate(mamaSubscriptionImpl *impl)
/* Destroy the state. */
wInterlocked_destroy(&impl->mState);
+ /* The subscription symbol. */
+ if(NULL != impl->mSubscSymbol)
+ {
+ free(impl->mSubscSymbol);
+ impl->mSubscSymbol = NULL;
+ }
/* Free the subscription impl. */
free(impl);
}
--
1.7.9.5
