Changeset 61365 in vbox

Timestamp:

Jun 1, 2016 11:23:47 AM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

107667

Message:

Main/glue-java.xsl: Addendum for r107491, make sure there is only a single object manager instance for all VirtualBoxManager instances or unregistering objects might end up with the wrong hash map if there is more than one VirtualBoxManager instance

File:

• trunk/src/VBox/Main/glue/glue-java.xsl (modified) (12 diffs)

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

@@ -4543 +4543 @@
     private final static ReferenceQueue<IUnknown> refQ = new ReferenceQueue<IUnknown>();
 
-    private final VboxPortType port;
     private final ConcurrentMap<String, ManagedObj> map = new ConcurrentHashMap<String, ManagedObj>();
     private final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
     private final ObjRefMgrCleanupThread objRefMgrCleanup;
 
-    public ObjectRefManager(VboxPortType port)
-    {
-        this.port = port;
+    public ObjectRefManager()
+    {
         this.objRefMgrCleanup = new ObjRefMgrCleanupThread(this, 100);
         this.objRefMgrCleanup.start();
@@ -4597 +4595 @@
     public void registerObj(IUnknown obj)
     {
+        assert lock.getReadLockCount() > 0;
         ManagedObjRef ref = new ManagedObjRef(obj);
 
@@ -4607 +4606 @@
         {
             /* Create new. */
-            mgrobj = new ManagedObj(obj.getWrapped());
+            mgrobj = new ManagedObj(obj.getWrapped(), obj.getRemoteWSPort());
             mgrobj.addObject(ref);
             map.put(obj.getWrapped(), mgrobj);
@@ -4621 +4620 @@
     public ManagedObj unregisterObj(ManagedObjRef objRef)
     {
-        assert lock.isWriteLockedByCurrentThread();
-
         ManagedObj obj = this.map.get(objRef.objId);
 
@@ -4635 +4632 @@
     public void releaseRemoteObj(ManagedObj obj)
     {
+        assert lock.isWriteLockedByCurrentThread();
+
         if (!obj.isReferenced())
         {
             try
             {
-                this.port.iManagedObjectRefRelease(obj.objId);
+                obj.port.iManagedObjectRefRelease(obj.objId);
             }
             catch (InvalidObjectFaultMsg e)
@@ -4663 +4662 @@
     {
         private final String                               objId;
+        private final VboxPortType                         port;
         private final ConcurrentLinkedQueue<ManagedObjRef> refQ;
 
-        ManagedObj(String objId)
+        ManagedObj(String objId,  VboxPortType port)
         {
           this.objId = objId;
+          this.port  = port;
           this.refQ  = new ConcurrentLinkedQueue<ManagedObjRef>();
         }
@@ -4897 +4898 @@
 {
     private static PortPool pool = new PortPool(true);
+    private static final ObjectRefManager objMgr = new ObjectRefManager();
     protected VboxPortType port;
 
     private IVirtualBox vbox;
-    private ObjectRefManager objMgr;
 
     private VirtualBoxManager()
@@ -4917 +4918 @@
     {
         this.port = pool.getPort();
-        this.objMgr = new ObjectRefManager(this.port);
         try
         {
@@ -4938 +4938 @@
 
             String handle = port.iWebsessionManagerLogon(username, passwd);
-            this.vbox = new IVirtualBox(handle, this.objMgr, port);
+            this.objMgr.preventObjRelease();
+            try
+            {
+                this.vbox = new IVirtualBox(handle, this.objMgr, port);
+            }
+            finally
+            {
+                this.objMgr.allowObjRelease();
+            }
         }
         catch (Throwable t)
@@ -4956 +4964 @@
     {
         this.port = pool.getPort();
-        this.objMgr = new ObjectRefManager(this.port);
-
         try
         {
@@ -4970 +4976 @@
                 put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, url);
             String handle = port.iWebsessionManagerLogon(username, passwd);
-            this.vbox = new IVirtualBox(handle, this.objMgr, port);
+            this.objMgr.preventObjRelease();
+            try
+            {
+                this.vbox = new IVirtualBox(handle, this.objMgr, port);
+            }
+            finally
+            {
+                this.objMgr.allowObjRelease();
+            }
         }
         catch (Throwable t)
@@ -5031 +5045 @@
         {
             String handle = port.iWebsessionManagerGetSessionObject(this.vbox.getWrapped());
-            return new ISession(handle, this.objMgr, port);
+            this.objMgr.preventObjRelease();
+            try
+            {
+                return new ISession(handle, this.objMgr, port);
+            }
+            finally
+            {
+                this.objMgr.allowObjRelease();
+            }
         }
         catch (InvalidObjectFaultMsg e)