[Recall-commits] CVS: corba/src/Recall Replica.py,1.12,1.13

[Eric C. N. <eri...@us...>]

Update of /cvsroot/recall/corba/src/Recall
In directory usw-pr-cvs1:/tmp/cvs-serv32188/Recall

Modified Files:
	Replica.py 
Log Message:
stop using name server, deal with object lookup failures




Index: Replica.py
===================================================================
RCS file: /cvsroot/recall/corba/src/Recall/Replica.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Replica.py	13 Feb 2002 02:58:00 -0000	1.12
--- Replica.py	21 Feb 2002 13:12:46 -0000	1.13
***************
*** 21,26 ****
      def obj(self):
          if not self.object:
              self.object = \
!                         CORBA.narrow(self._corba.find(self.name), idl.Echo)
          return self.object
  
--- 21,30 ----
      def obj(self):
          if not self.object:
+             # obj = self._corba.find(self.name + "/Recall")
+             obj = self._corba.find(self.name)
+             if not obj:
+                 raise BroadcastError("cannot find object named " + self.name)
              self.object = \
!                         CORBA.narrow(obj, idl.Echo)
          return self.object
  
***************
*** 105,109 ****
          except idl.DeferredWrite:
              result[r] = None
!         except (idl.NotSlave, CORBA.NotFound,
                  CORBA.COMM_FAILURE, CORBA.UNKNOWN,
                  CORBA.IMP_LIMIT):
--- 109,113 ----
          except idl.DeferredWrite:
              result[r] = None
!         except (idl.NotSlave, CORBA.NotFound, CORBA.OBJECT_NOT_EXIST,
                  CORBA.COMM_FAILURE, CORBA.UNKNOWN,
                  CORBA.IMP_LIMIT):