Changeset 10884

Timestamp:

09/26/11 13:34:24 (20 months ago)

Author:

Snyder.Jason

Message:

 

Files:

• ossiedev/trunk/tools/wavedash/src/WavedashUtils.py (modified) (6 diffs)

ossiedev/trunk/tools/wavedash/src/WavedashUtils.py

@@ -19 +19 @@
 from ossie.cf import CF
 from omniORB import CORBA
+import omniORB
+import _omnipy
 import sys
 import CosNaming
@@ -186 +188 @@
         self.enableGUI = enableGUI
         self.domMgr = None
-        #Add naming service address to sys.argv
+            
+        #Add naming service address to sys.argv 
         try:
             sys.argv.index('-ORBInitRef')
@@ -192 +195 @@
             sys.argv.append('-ORBInitRef')
             sys.argv.append('NameService=corbaname::'+self.__namingservice)
+
         
         #orb object has to be destroyed before moving to new naming service
         try:
+            print 'destorying'
             self.orb.destroy()
-        except:
+        except(Exception), val:
+            print val
             pass
-         
-        self.orb = CORBA.ORB_init(sys.argv, CORBA.ORB_ID)
-        self.obj = self.orb.resolve_initial_references("NameService")
+        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.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"
-            showMessage('Could not resolve initial references' , FATAL, self.enableGUI)
-            return
-        try:
-            self.rootContext = self.obj._narrow(CosNaming.NamingContext)
+            print "init_CORBA(): FATAL Error: Could not resolve initial references"  
+            showMessage('Could not resolve initial references' , FATAL, self.enableGUI)  
+            return -1
+        try:
+            self.rootContext = self.obj._narrow(CosNaming.NamingContext)  
         except(Exception), val:
             #print "init_CORBA(): FATAL Error: Failed to get naming context"
             #showMessage('Could not initialize CORBA. Failed to get naming context \n The application will now exit.', FATAL)
-            
+            print val
             newNS = False
             while not newNS:
@@ -216 +232 @@
                 ts += "Are the Naming Service and nodeBooter running on "+self.__namingservice+"?"
                
-                showMessage(ts, NON_FATAL, self.enableGUI)
-                nsDialog = NamingserviceDialog(self)
-                if nsDialog.GetReturnCode() == 1:
-                    newNS = True
-                elif nsDialog.GetReturnCode() == -2:
+                showMessage(ts, NON_FATAL, self.enableGUI) 
+                if self.enableGUI:
+                    nsDialog = NamingserviceDialog(self)
+                    if nsDialog.GetReturnCode() == 1:
+                        newNS = True
+                    elif nsDialog.GetReturnCode() == -2: 
                         sys.exit(-1)
+                else:
+                    print 'error'
+                    return -1
                 
             return
@@ -227 +247 @@
         if self.rootContext is None:
             print "init_CORBA(): FATAL Error: Failed to get root context" 
-            
             showMessage('Could not initialize CORBA.\nFailed to get root context', FATAL, self.enableGUI)
             return
-        name = [CosNaming.NameComponent("DomainName1",""), CosNaming.NameComponent("DomainManager","")]
+        name = [CosNaming.NameComponent("DomainName1",""), CosNaming.NameComponent("DomainManager","")] 
         try:
             self.obj = self.rootContext.resolve(name)
@@ -236 +255 @@
             print "init_CORBA(): FATAL Error: Could not find domain manager"
             showMessage('Could not find Domain Manager', FATAL, self.enableGUI)
-            return
+            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"
             showMessage('Could not resolve Domain Manager', FATAL, self.enableGUI)
         
-        #get the reference to FileManager to perform all file operations (list, open etc.. )
+        #get the reference to FileManager to perform all file operations (list, open etc.. ) 
         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"
             showMessage('Could not get file manager reference.\n' + 
                         'Has a domain manager been started with NodeBooter?', INFO, self.enableGUI)
+        return 0        
+        print 'done in init_CORBA()'
     
     def setNamingService (self, newNS):