Index: /ossiedev/trunk/tools/wavedash/src/WavedashUtils.py
===================================================================
--- /ossiedev/trunk/tools/wavedash/src/WavedashUtils.py	(revision 10884)
+++ /ossiedev/trunk/tools/wavedash/src/WavedashUtils.py	(revision 10892)
@@ -199,22 +199,19 @@
         #orb object has to be destroyed before moving to new naming service
         try:
-            print 'destorying'
+            #Omniorb seems to cache the orb object in the background
+            #and calling CORBA.ORB_init() will only give us a new orb
+            #if it doesnt have one in the cache. 
+            #To make sure we can switch to a new naming service if necessary
+            #first grab the cached version
+            self.orb = omniORB.orb
+            #and destroy it to make sure a new one is successfully created below
             self.orb.destroy()
+            
         except(Exception), val:
-            print val
             pass
-        list = []
-        list.append('-ORBInitRef')
-        list.append('NameService=corbaname::'+self.__namingservice)
-
-        print _omnipy.need_ORB_init()
-        #if _omnipy.need_ORB_init():
-        omniORB.poaCache.clear()
-        omniORB.orb = CORBA.ORB(list, CORBA.ORB_ID)
-        omniORB.rootPOA = None 
-        self.orb = omniORB.orb
+
+        self.orb = CORBA.ORB_init(sys.argv, CORBA.ORB_ID)
         
         self.obj = self.orb.resolve_initial_references("NameService") 
-        print 'self.obj: ' + str(self.obj)
         if self.obj is None:
             print "init_CORBA(): FATAL Error: Could not resolve initial references"  
@@ -243,5 +240,5 @@
                     return -1
                 
-            return
+            return 0
         
         if self.rootContext is None:
@@ -257,5 +254,4 @@
             return -1
         self.domMgr = self.obj._narrow(CF.DomainManager)
-        print 'self.domMgr: ' + str(self.domMgr)
         if self.domMgr is None:
             print "init_CORBA(): FATAL Error: Could not resolve domain manager"
@@ -265,5 +261,4 @@
         try:
             self.fileMgr = self.domMgr._get_fileMgr()
-            print 'self.fileMgr: ' + str(self.fileMgr)
         except:
             print "init_CORBA(): FATAL Error: Could not get file Manager from Domain manager"
@@ -271,5 +266,4 @@
                         'Has a domain manager been started with NodeBooter?', INFO, self.enableGUI)
         return 0        
-        print 'done in init_CORBA()'
     
     def setNamingService (self, newNS):