Merge branch '1.3-rel' (5fdb8a1) 33/22733/9
authorPhilippe Coval <philippe.coval@osg.samsung.com>
Fri, 17 Nov 2017 00:19:39 +0000 (01:19 +0100)
committerPhil Coval <philippe.coval@osg.samsung.com>
Fri, 17 Nov 2017 21:58:11 +0000 (21:58 +0000)
Change-Id: I3040a9e4ab81d6b4485bcb390a643955719ab8f5
Bug: https://jira.iotivity.org/browse/IOT-2453
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
16 files changed:
1  2 
resource/csdk/connectivity/src/camessagehandler.c
resource/csdk/resource-directory/src/rd_server.c
resource/csdk/security/include/experimental/doxmresource.h
resource/csdk/security/src/credresource.c
resource/csdk/security/src/doxmresource.c
resource/csdk/security/src/pkix_interface.c
resource/csdk/security/src/pstatresource.c
resource/csdk/security/src/rolesresource.c
resource/csdk/security/src/secureresourcemanager.c
resource/csdk/security/tool/json2cbor.c
resource/csdk/stack/include/experimental/payload_logging.h
resource/provisioning/unittests/OCProvisioningTest.cpp
service/easy-setup/enrollee/src/resourcehandler.c
service/notification/src/provider/NSProviderSubscription.c
service/notification/src/provider/NSProviderTopic.c
service/resource-encapsulation/src/serverBuilder/src/RCSResourceObject.cpp

  #include <srmutility.h>
  #include <OCProvisioningManager.hpp>
  #include <gtest/gtest.h>
 +#include "provisioningdatabasemanager.h"
  
  #define TIMEOUT 5
+ #define DB_FILE "./dbPath.tmp"
  
  namespace OCProvisioningTest
  {
@@@ -312,8 -312,13 +312,14 @@@ NSResult NSSendTopicList(OCEntityHandle
              topics = next;
          }
  
-         OCRepPayloadSetPropObjectArrayAsOwner(payload, NS_ATTRIBUTE_TOPIC_LIST,
-                     payloadTopicArray, dimensions);
+         OCRepPayloadSetPropObjectArray(payload, NS_ATTRIBUTE_TOPIC_LIST,
+                 (const OCRepPayload**) (payloadTopicArray), dimensions);
+         for (int i = 0; i < (int) dimensionSize; ++i)
+         {
+             OCRepPayloadDestroy(payloadTopicArray[i]);
+         }
+         NSOICFree(payloadTopicArray);
++
      }
      else
      {