Changeset 36814 in vbox

Timestamp:

Apr 22, 2011 1:18:05 PM (14 years ago)

Author:

vboxsync

Message:

Java XPCOM bridge: cleanup, survive multiple inits

Location:

trunk/src

Files:

• VBox/Main/glue/glue-java.xsl (modified) (4 diffs)
• libs/xpcom18a4/java/src/org/mozilla/xpcom/internal/XPCOMJavaProxy.java (modified) (1 diff)
• libs/xpcom18a4/java/src/org/virtualbox/VirtualBoxManager.java (deleted)

trunk/src/VBox/Main/glue/glue-java.xsl

@@ -2446 +2446 @@
     private IVirtualBox         vbox;
     private nsIComponentManager componentManager;
-    private nsIServiceManager   servMgr;
-
-    private VirtualBoxManager(Mozilla mozilla, nsIServiceManager servMgr)
+
+    private VirtualBoxManager(Mozilla mozilla)
     {
         this.mozilla = mozilla;
-        this.servMgr = servMgr;
         this.componentManager = mozilla.getComponentManager();
         this.vbox = new IVirtualBox((org.mozilla.interfaces.IVirtualBox) this.componentManager
@@ -2503 +2501 @@
 
     private static boolean hasInstance = false;
+    private static boolean isMozillaInited = false;
 
     public static synchronized VirtualBoxManager createInstance(String home)
@@ -2508 +2507 @@
         if (hasInstance)
             throw new VBoxException(null, "only one instance at the time allowed");
+        if (home == null || "".equals(home))
+            home = System.getProperty("vbox.home");
 
         if (home == null)
-            home = System.getProperty("vbox.home");
+            throw new RuntimeException("vbox.home Java property must be defined to use XPCOM bridge");
 
         File grePath = new File(home);
+
         Mozilla mozilla = Mozilla.getInstance();
-        mozilla.initialize(grePath);
-        nsIServiceManager servMgr = null;
-        try {
-            servMgr = mozilla.initXPCOM(grePath, null);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return null;
+        if (!isMozillaInited)
+        {
+           mozilla.initialize(grePath);
+           try {
+             mozilla.initXPCOM(grePath, null);
+             isMozillaInited = true;
+           } catch (Exception e) {
+             e.printStackTrace();
+             return null;
+           }
         }
 
         hasInstance = true;
 
-        return new VirtualBoxManager(mozilla, servMgr);
+        return new VirtualBoxManager(mozilla);
     }
 
@@ -2535 +2540 @@
     {
         deinitPerThread();
-        // cleanup
-        mozilla.shutdownXPCOM(servMgr);
+        // cleanup, we don't do that, as XPCOM bridge doesn't cleanly
+        // shuts down, so we prefer to avoid native shutdown
+        // mozilla.shutdownXPCOM(null);
         mozilla = null;
         hasInstance = false;

trunk/src/libs/xpcom18a4/java/src/org/mozilla/xpcom/internal/XPCOMJavaProxy.java

@@ -256 +256 @@
 
 }
-