Merge branch '1.3-rel' 79/19779/1
authorPhilippe Coval <philippe.coval@osg.samsung.com>
Wed, 10 May 2017 12:07:49 +0000 (14:07 +0200)
committerPhilippe Coval <philippe.coval@osg.samsung.com>
Wed, 10 May 2017 12:09:55 +0000 (14:09 +0200)
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Conflicts:
resource/csdk/security/src/credresource.c
resource/csdk/stack/src/ocserverrequest.c

Change-Id: I59fc87f40e41a0095bb6deed042b2a6f00000001
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
16 files changed:
1  2 
resource/IPCA/samples/ElevatorClient/ElevatorClient.cpp
resource/IPCA/samples/ipcaapp/ipcaapp.cpp
resource/IPCA/src/inc/callback.h
resource/IPCA/src/ipcavariant.cpp
resource/IPCA/unittests/IPCAElevatorClient.cpp
resource/c_common/platform_features.h
resource/csdk/connectivity/src/adapter_util/ca_adapter_net_ssl.c
resource/csdk/include/octypes.h
resource/csdk/security/provisioning/src/multipleownershiptransfermanager.c
resource/csdk/security/src/credresource.c
resource/csdk/stack/src/ocresource.c
resource/csdk/stack/src/ocserverrequest.c
resource/csdk/stack/src/ocstack.c
service/notification/src/provider/NSProviderNotification.c
service/notification/src/provider/NSProviderTopic.c
service/resource-encapsulation/src/common/primitiveResource/unittests/PrimitiveResourceTest.cpp

Simple merge
Simple merge
Simple merge
Simple merge
@@@ -56,7 -56,7 +56,8 @@@
  #include "certhelpers.h"
  #include "cacommon.h"
  #include "secureresourcemanager.h"
 +#include "ocstackinternal.h"
+ #include "deviceonboardingstate.h"
  
  #ifdef __unix__
  #include <sys/types.h>
Simple merge
@@@ -158,16 -121,17 +158,17 @@@ static OCServerResponse * GetServerResp
  /**
   * Delete a server response from the server response list
   *
 - * @param serverResponse - server response to delete
 + * @param[in] serverResponse    server response to delete
   */
 -static void DeleteServerResponse(OCServerResponse * serverResponse)
 +static void DeleteServerResponse (OCServerResponse * serverResponse)
  {
-     assert(serverResponse);
-     RB_REMOVE(ServerResponseTree, &g_serverResponseTree, serverResponse);
-     OICFree(serverResponse);
-     serverResponse = NULL;
-     OIC_LOG(INFO, TAG, "Server Response Removed");
 -    if(serverResponse)
++    if (serverResponse)
+     {
 -        RB_REMOVE(ServerResponseTree, &serverResponseTree, serverResponse);
++        RB_REMOVE(ServerResponseTree, &g_serverResponseTree, serverResponse);
+         OICFree(serverResponse);
+         serverResponse = NULL;
+         OIC_LOG(INFO, TAG, "Server Response Removed!!");
+     }
  }
  
  /**
Simple merge