[pytango] 435/483: Fix object deletion at server shutdown time

[Sandor Bodo-Merle]

This is an automated email from the git hooks/post-receive script.

sbodomerle-guest pushed a commit to annotated tag bliss_8.10
in repository pytango.

commit 8880ed14de5b3a98811aaaef7b6e9003f954c456
Author: coutinho <coutinho at esrf.fr>
Date:   Wed Dec 17 08:51:17 2014 +0100

    Fix object deletion at server shutdown time
---
 src/boost/python/server.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/boost/python/server.py b/src/boost/python/server.py
index abb46d6..9472998 100644
--- a/src/boost/python/server.py
+++ b/src/boost/python/server.py
@@ -1619,10 +1619,12 @@ class Server:
         self.__tango_classes.append(klass)
 
     def unregister_object(self, name):
-        del self.__objects[name.lower()]
+        tango_object = self.__objects.pop(name.lower())
         if self._phase > Server.Phase1:
             import PyTango
-            PyTango.Util.instance().delete_device(name)
+            util = PyTango.Util.instance()
+            if not util.is_svr_shutting_down():
+                util.delete_device(tango_object.tango_class_name, name)
 
     def register_object(self, obj, name, tango_class_name=None,
                         member_filter=None):

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pytango.git