Browse Source

fixed delayDelete implementation to handle delete via mid-call DelayDelete.destroy

Darren Ranalli 16 years ago
parent
commit
72f7489e66
1 changed files with 4 additions and 2 deletions
  1. 4 2
      direct/src/distributed/DistributedObject.py

+ 4 - 2
direct/src/distributed/DistributedObject.py

@@ -191,8 +191,10 @@ class DistributedObject(DistributedObjectBase):
                 # another instance of the same object gets generated while
                 # this instance is still delayDeleted.
                 messenger.send(self.getDelayDeleteEvent())
-                self.delayDelete()
-                self._deactivateDO()
+                if len(self._token2delayDeleteName) > 0:
+                    self.delayDelete()
+                    if len(self._token2delayDeleteName) > 0:
+                        self._deactivateDO()
         else:
             self.disableAnnounceAndDelete()