From 3adf7f9126d42e6299884eaf101785aa28a8eaf6 Mon Sep 17 00:00:00 2001 From: "jihwan.seo" Date: Thu, 2 Jun 2016 19:44:35 +0900 Subject: [PATCH] modified observe logic in ocstack when register/deregister of observation is failed, ocstack will send response directly. Change-Id: Ifb93dfbf2cc2ae5a449e676442194a5e8fa09976 Signed-off-by: jihwan.seo Reviewed-on: https://gerrit.iotivity.org/gerrit/8431 Tested-by: jenkins-iotivity Reviewed-by: Jon A. Cruz --- resource/csdk/stack/src/ocresource.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/resource/csdk/stack/src/ocresource.c b/resource/csdk/stack/src/ocresource.c index b503ab7..e862549 100755 --- a/resource/csdk/stack/src/ocresource.c +++ b/resource/csdk/stack/src/ocresource.c @@ -1096,13 +1096,13 @@ HandleResourceWithEntityHandler (OCServerRequest *request, } else { - result = OC_STACK_OK; - // The error in observeResult for the request will be used when responding to this // request by omitting the observation option/sequence number. request->observeResult = OC_STACK_ERROR; OIC_LOG(ERROR, TAG, "Observer Addition failed"); ehFlag = OC_REQUEST_FLAG; + FindAndDeleteServerRequest(request); + goto exit; } } @@ -1132,9 +1132,10 @@ HandleResourceWithEntityHandler (OCServerRequest *request, } else { - result = OC_STACK_OK; request->observeResult = OC_STACK_ERROR; OIC_LOG(ERROR, TAG, "Observer Removal failed"); + FindAndDeleteServerRequest(request); + goto exit; } } else -- 2.7.4