wingo - in flumotion/trunk: . flumotion/twisted

[flumotion-commit at lists.fluendo.com]

Author: wingo
Date: Wed Jan  3 13:44:06 2007
New Revision: 4374

Modified:
   flumotion/trunk/ChangeLog
   flumotion/trunk/flumotion/twisted/pb.py
Log:
	(Avatar.disconnect): Don't error if we're already disconnected.



Modified: flumotion/trunk/ChangeLog
==============================================================================
--- flumotion/trunk/ChangeLog	(original)
+++ flumotion/trunk/ChangeLog	Wed Jan  3 13:44:06 2007
@@ -4,6 +4,7 @@
 	(Avatar.mindCallRemote, Avatar.mindCallRemoteLogging.errback)
 	(Avatar.mindCallRemoteLogging.callback)
 	(Avatar.mindCallRemoteLogging): Floggulate.
+	(Avatar.disconnect): Don't error if we're already disconnected.
 
 	* flumotion/common/medium.py (PingingMedium._ping): PONG
 

Modified: flumotion/trunk/flumotion/twisted/pb.py
==============================================================================
--- flumotion/trunk/flumotion/twisted/pb.py	(original)
+++ flumotion/trunk/flumotion/twisted/pb.py	Wed Jan  3 13:44:06 2007
@@ -719,9 +719,11 @@
 
     def disconnect(self):
         """
-        Disconnect the remote PB client.
+        Disconnect the remote PB client. If we are already disconnected,
+        do nothing.
         """
-        self.mind.broker.transport.loseConnection()
+        if self.mind:
+            self.mind.broker.transport.loseConnection()
 
 class PingableAvatar(Avatar):
     _pingCheckInterval = configure.heartbeatInterval * 2.5