Merge pull request #662 from didishe90/SetProtocolCallback

Make sure protocol callback is set on the binding object in SubscriptionClient
diff --git a/src/lib/profiles/data-management/Current/SubscriptionClient.cpp b/src/lib/profiles/data-management/Current/SubscriptionClient.cpp
index a4319f1..393b083 100644
--- a/src/lib/profiles/data-management/Current/SubscriptionClient.cpp
+++ b/src/lib/profiles/data-management/Current/SubscriptionClient.cpp
@@ -863,6 +863,9 @@
 {
     mConfig = kConfig_Initiator;
 
+    // Make double sure the protocol callback is set on the binding object
+    mBinding->SetProtocolLayerCallback(BindingEventCallback, this);
+
     if (IsRetryEnabled())
     {
         if (false == mBinding->IsPreparing())
diff --git a/src/lib/profiles/data-management/Current/SubscriptionHandler.cpp b/src/lib/profiles/data-management/Current/SubscriptionHandler.cpp
index a32ab9d..ad888a6 100644
--- a/src/lib/profiles/data-management/Current/SubscriptionHandler.cpp
+++ b/src/lib/profiles/data-management/Current/SubscriptionHandler.cpp
@@ -1785,7 +1785,6 @@
 
     // Capture the binding and arrange to receive event callbacks.
     mBinding->AddRef();
-    mBinding->SetProtocolLayerCallback(BindingEventCallback, this);
 
     mBytesOffloaded = 0;