From: ywsung Date: Wed, 21 Jan 2015 03:54:20 +0000 (+0900) Subject: Resolve Bug IOT-273 (rename "OC_STACK_REPEATED_REQUEST") X-Git-Tag: 1.2.0+RC1~1966 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4b1303358096718ca0f72998e41a2ccec027890f;hp=65ecd8a508bf04d03153a9510a78995715242963;p=platform%2Fupstream%2Fiotivity.git Resolve Bug IOT-273 (rename "OC_STACK_REPEATED_REQUEST") - OCStackResult "OC_STACK_REPEATED_REQUEST" is renamed to "OC_STACK_DUPLICATE_REQUEST" - In StringConstants.h, "REPEATE_REQUEST" is rename to "DUPLICATE_REQUEST" (Message string also changed) Change-Id: Ie3bca4642441a59c3c66a98513d0f15d2e923096 Signed-off-by: ywsung Reviewed-on: https://gerrit.iotivity.org/gerrit/177 Tested-by: jenkins-iotivity Reviewed-by: Sashi Penta Reviewed-by: Joseph Morrow Reviewed-by: Sudarshan Prasad --- diff --git a/resource/csdk/occoap/src/occoap.c b/resource/csdk/occoap/src/occoap.c index ccf428b..63aa982 100644 --- a/resource/csdk/occoap/src/occoap.c +++ b/resource/csdk/occoap/src/occoap.c @@ -256,7 +256,7 @@ static void HandleCoAPRequests(struct coap_context_t *ctx, goto exit; } else if(requestResult == OC_STACK_SLOW_RESOURCE || - requestResult == OC_STACK_REPEATED_REQUEST) + requestResult == OC_STACK_DUPLICATE_REQUEST) { if(rcvdPdu->hdr->type == COAP_MESSAGE_CON) { diff --git a/resource/csdk/stack/include/ocstack.h b/resource/csdk/stack/include/ocstack.h index 8720a48..317d5cd 100644 --- a/resource/csdk/stack/include/ocstack.h +++ b/resource/csdk/stack/include/ocstack.h @@ -158,7 +158,7 @@ typedef enum { OC_STACK_NO_RESOURCE, /* resource not found */ OC_STACK_RESOURCE_ERROR, /* ex: not supported method or interface */ OC_STACK_SLOW_RESOURCE, - OC_STACK_REPEATED_REQUEST, + OC_STACK_DUPLICATE_REQUEST, OC_STACK_NO_OBSERVERS, /* resource has no registered observers */ OC_STACK_OBSERVER_NOT_FOUND, OC_STACK_VIRTUAL_DO_NOT_HANDLE, diff --git a/resource/csdk/stack/src/ocstack.c b/resource/csdk/stack/src/ocstack.c index 74fcb14..b740dfc 100644 --- a/resource/csdk/stack/src/ocstack.c +++ b/resource/csdk/stack/src/ocstack.c @@ -235,7 +235,7 @@ OCStackResult HandleStackRequests(OCServerProtocolRequest * protocolRequest) else { OC_LOG(INFO, TAG, PCF("This is either a repeated Server Request or blocked Server Request")); - result = OC_STACK_REPEATED_REQUEST; + result = OC_STACK_DUPLICATE_REQUEST; } return result; diff --git a/resource/include/StringConstants.h b/resource/include/StringConstants.h index a27fcd8..5782f04 100644 --- a/resource/include/StringConstants.h +++ b/resource/include/StringConstants.h @@ -79,7 +79,7 @@ namespace OC static const char NOT_FOUND[] = "Resource Not Found"; static const char RESOURCE_ERROR[] = "Resource Error"; static const char SLOW_RESOURCE[] = "Slow Resource"; - static const char REPEATED_REQUEST[] = "Repeated Request"; + static const char DUPLICATE_REQUEST[] = "Duplicate Request"; static const char NO_OBSERVERS[] = "No Observers"; static const char OBSV_NO_FOUND[] = "Stack observer not found"; static const char OBSV_NOT_ADDED[] = "Stack observer not added"; diff --git a/resource/src/OCException.cpp b/resource/src/OCException.cpp index eb2b201..76e54eb 100644 --- a/resource/src/OCException.cpp +++ b/resource/src/OCException.cpp @@ -61,8 +61,8 @@ std::string OC::OCException::reason(const OCStackResult sr) return OC::Exception::RESOURCE_ERROR; case OC_STACK_SLOW_RESOURCE: return OC::Exception::SLOW_RESOURCE; - case OC_STACK_REPEATED_REQUEST: - return OC::Exception::REPEATED_REQUEST; + case OC_STACK_DUPLICATE_REQUEST: + return OC::Exception::DUPLICATE_REQUEST; case OC_STACK_NO_OBSERVERS: return OC::Exception::NO_OBSERVERS; case OC_STACK_OBSERVER_NOT_FOUND: