projects
/
platform
/
upstream
/
iotivity.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
replace : iotivity -> iotivity-sec
[platform/upstream/iotivity.git]
/
resource
/
csdk
/
stack
/
samples
/
linux
/
SimpleClientServer
/
ocservercoll.cpp
diff --git
a/resource/csdk/stack/samples/linux/SimpleClientServer/ocservercoll.cpp
b/resource/csdk/stack/samples/linux/SimpleClientServer/ocservercoll.cpp
index
b5408d0
..
bedce0d
100644
(file)
--- a/
resource/csdk/stack/samples/linux/SimpleClientServer/ocservercoll.cpp
+++ b/
resource/csdk/stack/samples/linux/SimpleClientServer/ocservercoll.cpp
@@
-19,6
+19,7
@@
//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+#include "iotivity_config.h"
#include <stdio.h>
#include <string.h>
#include <string>
#include <stdio.h>
#include <string.h>
#include <string>
@@
-38,7
+39,6
@@
#include <getopt.h>
#include "ocpayload.h"
#include "common.h"
#include <getopt.h>
#include "ocpayload.h"
#include "common.h"
-#include "platform_features.h"
#define TAG PCF("ocservercontainer")
#define TAG PCF("ocservercontainer")
@@
-319,9
+319,9
@@
OCEntityHandlerResult OCEntityHandlerRoomCb(OCEntityHandlerFlag flag,
{
OIC_LOG_V (INFO, TAG, "Received unsupported method %d from client",
ehRequest->method);
{
OIC_LOG_V (INFO, TAG, "Received unsupported method %d from client",
ehRequest->method);
- OCRepPayloadDestroy(payload);
ret = OC_EH_ERROR;
}
ret = OC_EH_ERROR;
}
+ OCRepPayloadDestroy(payload);
}
else if (ehRequest && flag == OC_OBSERVE_FLAG)
{
}
else if (ehRequest && flag == OC_OBSERVE_FLAG)
{
@@
-382,10
+382,7
@@
OCEntityHandlerResult OCEntityHandlerLightCb(OCEntityHandlerFlag flag,
ret = OC_EH_ERROR;
}
}
ret = OC_EH_ERROR;
}
}
- else
- {
- OCRepPayloadDestroy(payload);
- }
+ OCRepPayloadDestroy(payload);
}
else if (ehRequest && flag == OC_OBSERVE_FLAG)
{
}
else if (ehRequest && flag == OC_OBSERVE_FLAG)
{