From 01c54a2d3c5dbda4e27b4f60cbe3934dd72c574a Mon Sep 17 00:00:00 2001 From: Zachary Pavlov Date: Mon, 27 Nov 2006 20:52:21 +0000 Subject: [PATCH] failsafe now in for systems without native --- direct/src/distributed/ConnectionRepository.py | 5 ++++- direct/src/distributed/DoInterestManager.py | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/direct/src/distributed/ConnectionRepository.py b/direct/src/distributed/ConnectionRepository.py index bf35c95895..7fe303908c 100644 --- a/direct/src/distributed/ConnectionRepository.py +++ b/direct/src/distributed/ConnectionRepository.py @@ -392,7 +392,7 @@ class ConnectionRepository( ch, serverList, 0, successCallback, successArgs, failureCallback, failureArgs) - elif self.connectMethod == self.CM_NSPR: + elif self.connectMethod == self.CM_NSPR or (not hasattr(self,"connectNative")): # Try each of the servers in turn. for url in serverList: self.notify.info("Connecting to %s via NSPR interface." % (url.cStr())) @@ -417,6 +417,9 @@ class ConnectionRepository( # Failed to connect. if failureCallback: failureCallback(0, '', *failureArgs) + else: + print "uh oh, we aren't using one of the tri-state CM variables" + failureCallback(0, '', *failureArgs) def disconnect(self): """ Closes the previously-established connection. diff --git a/direct/src/distributed/DoInterestManager.py b/direct/src/distributed/DoInterestManager.py index de6a29641a..2d4ca1ead2 100755 --- a/direct/src/distributed/DoInterestManager.py +++ b/direct/src/distributed/DoInterestManager.py @@ -141,6 +141,7 @@ class DoInterestManager(DirectObject.DirectObject): """ Look into a (set of) zone(s). """ + assert DoInterestManager.notify.debugCall() #assert not self._noNewInterests handle = self._getNextHandle() @@ -185,6 +186,7 @@ class DoInterestManager(DirectObject.DirectObject): """ Stop looking in a (set of) zone(s) """ + assert DoInterestManager.notify.debugCall() assert isinstance(handle, InterestHandle) existed = False