projects
/
platform
/
upstream
/
iotivity.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CONPRO-1320] Cleanup observers of deleted resource.
[platform/upstream/iotivity.git]
/
resource
/
csdk
/
stack
/
src
/
ocstack.c
diff --git
a/resource/csdk/stack/src/ocstack.c
b/resource/csdk/stack/src/ocstack.c
index
f469c51
..
139ff3a
100755
(executable)
--- a/
resource/csdk/stack/src/ocstack.c
+++ b/
resource/csdk/stack/src/ocstack.c
@@
-4649,6
+4649,9
@@
OCStackResult deleteResource(OCResource *resource)
SendPresenceNotification(resource->rsrcType, OC_PRESENCE_TRIGGER_DELETE);
}
#endif
SendPresenceNotification(resource->rsrcType, OC_PRESENCE_TRIGGER_DELETE);
}
#endif
+ // Delete resource's all observers
+ DeleteObserverUsingResource(resource);
+
// Only resource in list.
if (temp == headResource && temp == tailResource)
{
// Only resource in list.
if (temp == headResource && temp == tailResource)
{
@@
-4717,6
+4720,8
@@
void deleteResourceElements(OCResource *resource)
OCDeleteResourceAttributes(resource->rsrcAttributes);
resource->rsrcAttributes = NULL;
}
OCDeleteResourceAttributes(resource->rsrcAttributes);
resource->rsrcAttributes = NULL;
}
+
+ resource->entityHandler = NULL;
resource = NULL;
}
resource = NULL;
}