Changeset 31166 in vbox

Timestamp:

Jul 28, 2010 2:38:35 PM (14 years ago)

Author:

vboxsync

Message:

Java bridge: allow multiple concurrent SOAP connections

Location:

trunk/src/VBox/Main/glue

Files:

• glue-java.xsl (modified) (8 diffs)
• tests/TestVBox.java (modified) (1 diff)

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

@@ -2510 +2510 @@
     }
 
-    private static VirtualBoxManager mgr;
-
-    public static synchronized VirtualBoxManager getInstance(String home)
-    {
-        if (mgr != null)
-            return mgr;
+    private static boolean hasInstance = false;
+
+    public static synchronized VirtualBoxManager createInstance(String home)
+    {
+        if (hasInstance)
+            throw new VBoxException(null, "only one instance at the time allowed");
 
         if (home == null)
@@ -2531 +2531 @@
         }
 
-        mgr = new VirtualBoxManager(mozilla, servMgr);
-        return mgr;
+        hasInstance = true;
+
+        return new VirtualBoxManager(mozilla, servMgr);
     }
 
@@ -2545 +2546 @@
         mozilla.shutdownXPCOM(servMgr);
         mozilla = null;
+        hasInstance = false;
     }
 
@@ -3006 +3008 @@
         ISession s = getSessionObject();
         m.lockMachine(s, LockType.Shared);
-        return s;       
-    }
-   
+        return s;
+    }
+
     public void closeMachineSession(ISession s)
     {
@@ -3015 +3017 @@
     }
 
-    private static VirtualBoxManager mgr;
-
-    public static synchronized VirtualBoxManager getInstance(String home)
-    {
-        if (mgr != null)
-            return mgr;
-
-        if (home == null)
-            home = System.getProperty("vbox.home");
-
-        mgr = new VirtualBoxManager();
-        return mgr;
+    private static boolean hasInstance = false;
+
+    public static synchronized VirtualBoxManager createInstance(String home)
+    {
+        if (hasInstance)
+          throw new VBoxException(null, "only one instance at the time allowed");
+
+        hasInstance = true;
+        return new VirtualBoxManager();
     }
 
@@ -3032 +3031 @@
     {
         deinitPerThread();
-        mgr = null;
+        hasInstance = false;
     }
 
@@ -3207 +3206 @@
             List<T2> ret = new ArrayList<T2>(values.size());
             for (T1 v : values) {
-                // static method is called with null this                
+                // static method is called with null this
                 ret.add((T2)fromValue.invoke(null, v.name()));
             }
@@ -3460 +3459 @@
     }
 
-    private static VirtualBoxManager mgr;
-
-    public static synchronized VirtualBoxManager getInstance(String home)
-    {
-        if (mgr != null)
-            return mgr;
-
-        mgr = new VirtualBoxManager();
-        return mgr;
+    public static synchronized VirtualBoxManager createInstance(String home)
+    {
+        return new VirtualBoxManager();
     }
 

trunk/src/VBox/Main/glue/tests/TestVBox.java

@@ -96 +96 @@
     }
 
+    static void testMultiServer()
+    {
+        VirtualBoxManager mgr1 = VirtualBoxManager.createInstance(null);
+        VirtualBoxManager mgr2 = VirtualBoxManager.createInstance(null);
+
+        try {
+            mgr1.connect("http://i7:18083", "", "");
+            mgr2.connect("http://main:18083", "", "");
+
+            String mach1 =  mgr1.getVBox().getMachines().get(0).getName();
+            String mach2 =  mgr2.getVBox().getMachines().get(0).getName();
+
+            mgr1.startVm(mach1, null, 7000);
+            mgr2.startVm(mach2, null, 7000);
+        } finally {
+            mgr1.cleanup();
+            mgr2.cleanup();
+        }
+    }
+
     public static void main(String[] args)
     {
-        VirtualBoxManager mgr = VirtualBoxManager.getInstance(null);
+        VirtualBoxManager mgr = VirtualBoxManager.createInstance(null);
 
         boolean ws = false;