Index: initFile.cc =================================================================== RCS file: /project/omni/cvsroot/omni/src/lib/omniORB2/orbcore/initFile.cc,v retrieving revision 1.30 diff -u -r1.30 initFile.cc --- initFile.cc 1999/09/01 13:13:55 1.30 +++ initFile.cc 2000/03/07 11:20:58 @@ -271,20 +271,11 @@ omniObject* objptr = omni::stringToObject(data); NameService = (CORBA::Object_ptr) objptr->_widenFromTheMostDerivedIntf(0); - } catch(const CORBA::MARSHAL&) { invref(entryname); } - - if((NameService->PR_getobj()->_widenFromTheMostDerivedIntf( - CosNaming_NamingContext_IntfRepoID)) == 0) - { - // The object reference supplied is not for the NamingService - - invref(entryname); - } omniInitialReferences::singleton()->set("NameService",NameService); } else if (strcmp(entryname, "INTERFACE_REPOSITORY") == 0) @@ -297,24 +288,11 @@ omniObject* objptr = omni::stringToObject(data); InterfaceRepository = (CORBA::Object_ptr) objptr->_widenFromTheMostDerivedIntf(0); - } catch(const CORBA::MARSHAL&) { invref(entryname); } -#if 0 - // Doing this test would make the orbcore dependent on the - // dynamic library. - if((InterfaceRepository->PR_getobj()->_widenFromTheMostDerivedIntf( - CORBA_Repository_IntfRepoID)) == 0) - { - // The object reference supplied is not for the interface - // repository - - invref(entryname); - } -#endif omniInitialReferences::singleton()->set("InterfaceRepository", InterfaceRepository); }