From: Omkar Hegde <omkar.m.hegde@intel.com>
Date: Wed, 15 Jul 2015 23:54:56 +0000 (-0700)
Subject: Fixed broken platform and device discovery
X-Git-Tag: 0.9.2-beta~22
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9746d4849a7172b701a037dea12207be60bd9a02;p=contrib%2Fiotivity.git

Fixed broken platform and device discovery

The stack result was not being set on forming
the payload. Also, the device payload was being set
into the incorrect variable.

Change-Id: I18875b9ba0bd9776f0914317617c3c5d66ed64f8
Signed-off-by: Omkar Hegde <omkar.m.hegde@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1681
Reviewed-by: Erich Keane <erich.keane@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
---

diff --git a/resource/csdk/stack/src/ocresource.c b/resource/csdk/stack/src/ocresource.c
index fb7cdad..f5984e9 100644
--- a/resource/csdk/stack/src/ocresource.c
+++ b/resource/csdk/stack/src/ocresource.c
@@ -536,16 +536,24 @@ static OCStackResult HandleVirtualResource (OCServerRequest *request, OCResource
             {
                 discoveryResult = OC_STACK_NO_MEMORY;
             }
+            else
+            {
+                discoveryResult = OC_STACK_OK;
+            }
     }
     else if (virtualUriInRequest == OC_PLATFORM_URI)
     {
-            OCPlatformPayload* payload = OCPlatformPayloadCreate(
+            payload = (OCPayload*)OCPlatformPayloadCreate(
                     OC_RSRVD_PLATFORM_URI,
                     &savedPlatformInfo);
             if (!payload)
             {
                 discoveryResult = OC_STACK_NO_MEMORY;
             }
+            else
+            {
+                discoveryResult = OC_STACK_OK;
+            }
     }
 
     #ifdef WITH_PRESENCE