Merge pull request #456 from openweave/feature/wdm-con-support-and-clean-up

Support for WDM subscriptions and update over connections

Author: Jay Logue

src/lib/profiles/data-management/Current/NotificationEngine.cpp

@@ -1122,13 +1122,17 @@ WEAVE_ERROR NotificationEngine::SendNotify(PacketBuffer * aBuffer, SubscriptionH
 {
     WEAVE_ERROR err = WEAVE_NO_ERROR;
 
-    err = aSubHandler->SendNotificationRequest(aBuffer);
-    SuccessOrExit(err);
-
     // We can only have 1 notify in flight for any given subscription - increment and break out.
     mNumNotifiesInFlight++;
 
+    err = aSubHandler->SendNotificationRequest(aBuffer);
+    SuccessOrExit(err);
+
 exit:
+    if (err != WEAVE_NO_ERROR)
+    {
+        mNumNotifiesInFlight--;
+    }
     return err;
 }
 
@@ -1584,7 +1588,7 @@ WEAVE_ERROR NotificationEngine::BuildSingleNotifyRequest(SubscriptionHandler * a
     {
         // abort subscription, squash error, signal to upper
         // layers that the subscription is done
-        aSubHandler->HandleSubscriptionTerminated(err, NULL);
+        aSubHandler->TerminateSubscription(err, NULL, false);
 
         aSubscriptionHandled = true;
         err                  = WEAVE_NO_ERROR;