projects
/
platform
/
upstream
/
iotivity.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
dfcdec1
)
(IOT-1014) modified sceneCollectionResource
author
wonny
<jw_wonny.cha@samsung.com>
Wed, 23 Mar 2016 05:57:19 +0000
(14:57 +0900)
committer
Uze Choi
<uzchoi@samsung.com>
Thu, 24 Mar 2016 02:38:13 +0000
(
02:38
+0000)
resolved jira issue IOT-1014
When scene execute, this issue is caused by not adding scene name
in SceneCollectionResource.
modified parameter in execute API.
Change-Id: I0c78bcd9523f2f425832c0d4934a1b9abd560d81
Signed-off-by: wonny <jw_wonny.cha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6199
Reviewed-by: JungYong KIM <jyong2.kim@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
service/scene-manager/src/SceneCollectionResource.cpp
patch
|
blob
|
history
diff --git
a/service/scene-manager/src/SceneCollectionResource.cpp
b/service/scene-manager/src/SceneCollectionResource.cpp
index
6d23134
..
6467ec9
100755
(executable)
--- a/
service/scene-manager/src/SceneCollectionResource.cpp
+++ b/
service/scene-manager/src/SceneCollectionResource.cpp
@@
-187,7
+187,7
@@
namespace OIC
}
m_sceneCollectionResourceObject->setAttribute(
- SCENE_KEY_LAST_SCENE, s
td::move(sceneName)
);
+ SCENE_KEY_LAST_SCENE, s
ceneName
);
{
std::lock_guard<std::mutex> memberlock(m_sceneMemberLock);
@@
-196,7
+196,7
@@
namespace OIC
shared_from_this(), std::move(executeCB));
for (auto & it : m_sceneMembers)
{
- it->execute(s
ceneName
, std::bind(
+ it->execute(s
td::move(sceneName)
, std::bind(
&SceneExecuteResponseHandler::onResponse, executeHandler,
std::placeholders::_1, std::placeholders::_2));
}