Browse Source

failsafe now in for systems without native

Zachary Pavlov 19 years ago
parent
commit
01c54a2d3c

+ 4 - 1
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.

+ 2 - 0
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