Changeset 22142 in vbox for trunk/src/VBox/Main/webservice

Timestamp:

Aug 10, 2009 4:17:02 PM (16 years ago)

Author:

vboxsync

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

50912

Message:

Java glue: fixed memory leaks on error path for VDI, make port reusable only certain number of times

File:

• trunk/src/VBox/Main/webservice/glue-jaxws.xsl (modified) (13 diffs)

trunk/src/VBox/Main/webservice/glue-jaxws.xsl

@@ -176 +176 @@
   <xsl:param name="safearray" />
   <xsl:param name="forceelem" />
-  
+
   <xsl:variable name="needarray" select="($safearray='yes') and not($forceelem='yes')" />
 
@@ -213 +213 @@
   <xsl:param name="idltype"/>
   <xsl:param name="safearray"/>
-  <xsl:variable name="isstruct" 
+  <xsl:variable name="isstruct"
                 select="//interface[@name=$idltype]/@wsmap='struct'" />
   <xsl:choose>
@@ -281 +281 @@
                <xsl:value-of select="concat('(', $value, ' != null) ? new ', $gluetype, '(', $value,', port) : null')" />
              </xsl:when>
-              <xsl:otherwise>             
+              <xsl:otherwise>
                 <!-- if the MOR string is empty, that means NULL, so return NULL instead of an object then -->
                 <xsl:value-of select="concat('(', $value, '.length() > 0) ? new ', $gluetype, '(', $value,', port) : null')" />
@@ -297 +297 @@
 <xsl:template name="genStructWrapper">
   <xsl:param name="ifname" select="@name" />
-  
+
   <xsl:value-of select="concat('    private ', $G_virtualBoxPackage,'.',$ifname, ' real;&#10;')"/>
   <xsl:value-of select="'    private VboxPortType port;&#10;&#10;'"/>
@@ -306 +306 @@
     <xsl:variable name="attrtype"><xsl:value-of select="@type" /></xsl:variable>
     <xsl:variable name="attrreadonly"><xsl:value-of select="@readonly" /></xsl:variable>
-    <xsl:variable name="attrsafearray"><xsl:value-of select="@safearray" /></xsl:variable>    
+    <xsl:variable name="attrsafearray"><xsl:value-of select="@safearray" /></xsl:variable>
      <xsl:choose>
        <xsl:when test="$attrreadonly='yes'">
          <xsl:value-of select="concat('&#10;    // read-only attribute ', $ifname, '::', $attrname, ' of type ', $attrtype, '&#10;')" />
-         
+
        </xsl:when>
        <xsl:otherwise>
@@ -369 +369 @@
 
   </xsl:for-each>
-  
+
 </xsl:template>
 
@@ -633 +633 @@
     {
         VboxPortType port = null;
+        int ttl = 0;
+
         for (VboxPortType cur: known.keySet())
         {
-            if (known.get(cur) == 0)
+            int value = known.get(cur);
+            if ((value & 0x10000) == 0)
             {
                 port = cur;
+                ttl = value & 0xffff;
                 break;
             }
@@ -653 +657 @@
             }
             port = svc.getVboxServicePort();
+            // reuse this object 0x10 times
+            ttl = 0x10;
         }
-        known.put(port, new Integer(1));
+        // mark as used
+        known.put(port, new Integer(0x10000 | ttl));
         return port;
     }
@@ -660 +667 @@
     synchronized void releasePort(VboxPortType port)
     {
-        Integer val =  known.get(port);
+        Integer val = known.get(port);
         if (val == null || val == 0)
         {
@@ -666 +673 @@
             return;
         }
-        known.put(port, val - 1);
+
+        int v = val;
+        int ttl = v & 0xffff;
+        // decrement TTL, and throw away port if used too much times
+        if (--ttl <= 0)
+        {
+            known.remove(port);
+        }
+        else
+        {
+            v = ttl; // set new TTL and clear busy bit
+            known.put(port, v);
+        }
     }
 }
@@ -703 +722 @@
     {
         this.port = pool.getPort();
-        ((BindingProvider)port).getRequestContext().
-                put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, url);
+
+         try {
+          ((BindingProvider)port).getRequestContext().
+                 put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, url);
+         }  catch (Throwable t) {
+             if (this.port != null)
+                pool.releasePort(this.port);
+             // we have to throw smth derived from RuntimeException
+             throw new WebServiceException(t);
+          }
     }
 
@@ -711 +738 @@
          this.port = pool.getPort();
 
-         ((BindingProvider)port).getRequestContext();
-         if (requestContext != null)
+         try {
+           ((BindingProvider)port).getRequestContext();
+           if (requestContext != null)
                ((BindingProvider)port).getRequestContext().putAll(requestContext);
 
-         if (responseContext != null)
+           if (responseContext != null)
                ((BindingProvider)port).getResponseContext().putAll(responseContext);
 
-         ((BindingProvider)port).getRequestContext().
+           ((BindingProvider)port).getRequestContext().
                 put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, url);
+          } catch (Throwable t) {
+             if (this.port != null)
+                pool.releasePort(port);
+             // we have to throw smth derived from RuntimeException
+             throw new WebServiceException(t);
+          }
     }
 
@@ -726 +760 @@
     {
         logoff(refIVirtualBox);
-        pool.releasePort(port);
+        pool.releasePort(this.port);
     }