You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by ba...@apache.org on 2008/04/17 20:19:38 UTC

svn commit: r649213 - /webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/EndpointDescriptionImpl.java

Author: barrettj
Date: Thu Apr 17 11:19:35 2008
New Revision: 649213

URL: http://svn.apache.org/viewvc?rev=649213&view=rev
Log:
Add call to AxisService.releaseSchemaList in EndpointDescriptionImpl constructors.

Modified:
    webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/EndpointDescriptionImpl.java

Modified: webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/EndpointDescriptionImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/EndpointDescriptionImpl.java?rev=649213&r1=649212&r2=649213&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/EndpointDescriptionImpl.java (original)
+++ webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/EndpointDescriptionImpl.java Thu Apr 17 11:19:35 2008
@@ -211,7 +211,6 @@
                             ServiceDescriptionImpl parent) {
         this(theClass, portName, dynamicPort, parent, null, null);
     }
-
     EndpointDescriptionImpl(Class theClass, QName portName, boolean dynamicPort,
                             ServiceDescriptionImpl parent, 
                             DescriptionBuilderComposite sparseComposite,
@@ -265,7 +264,10 @@
         } catch (Exception e) {
             String msg = Messages.getMessage("endpointDescriptionErr2",e.getClass().getName(),parent.getClass().getName());
             throw ExceptionFactory.makeWebServiceException(msg, e);
+        } finally {
+            releaseAxisServiceResources();
         }
+        
     }
     
     EndpointDescriptionImpl(ServiceDescriptionImpl parent, String serviceImplName) {
@@ -536,6 +538,9 @@
         
         // Configure any available WebServiceFeatures on the endpoint.
         configureWebServiceFeatures();
+        
+        // REVIEW: there are some throws above that won't cause the release
+        releaseAxisServiceResources();
     }
 
     /**
@@ -571,6 +576,8 @@
         buildEndpointDescriptionFromAnnotations();
         
         configureWebServiceFeatures();
+        
+        releaseAxisServiceResources();
 
         // The anonymous AxisOperations are currently NOT added here.  The reason 
         // is that (for now) this is a SERVER-SIDE code path, and the anonymous operations
@@ -1010,6 +1017,13 @@
 
         //TODO: Set other things on AxisService here, this function may have to be
         //      moved to after we create all the AxisOperations
+    }
+
+    private void releaseAxisServiceResources() {
+        // release the schema list in the AxisService
+        if (axisService != null) {
+            axisService.releaseSchemaList();
+        }
     }
 
     private void buildDescriptionHierachy() {



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org


Re: svn commit: r649213 - /webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/EndpointDescriptionImpl.java

Posted by Jarek Gawor <jg...@gmail.com>.
Jeff,

This change breaks ?xsd=foo.xsd lookups.

Jarek

On Thu, Apr 17, 2008 at 2:19 PM,  <ba...@apache.org> wrote:
> Author: barrettj
>  Date: Thu Apr 17 11:19:35 2008
>  New Revision: 649213
>
>  URL: http://svn.apache.org/viewvc?rev=649213&view=rev
>  Log:
>  Add call to AxisService.releaseSchemaList in EndpointDescriptionImpl constructors.
>
>  Modified:
>     webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/EndpointDescriptionImpl.java
>
>  Modified: webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/EndpointDescriptionImpl.java
>  URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/EndpointDescriptionImpl.java?rev=649213&r1=649212&r2=649213&view=diff
>  ==============================================================================
>  --- webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/EndpointDescriptionImpl.java (original)
>  +++ webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/EndpointDescriptionImpl.java Thu Apr 17 11:19:35 2008
>  @@ -211,7 +211,6 @@
>                              ServiceDescriptionImpl parent) {
>          this(theClass, portName, dynamicPort, parent, null, null);
>      }
>  -
>      EndpointDescriptionImpl(Class theClass, QName portName, boolean dynamicPort,
>                              ServiceDescriptionImpl parent,
>                              DescriptionBuilderComposite sparseComposite,
>  @@ -265,7 +264,10 @@
>          } catch (Exception e) {
>              String msg = Messages.getMessage("endpointDescriptionErr2",e.getClass().getName(),parent.getClass().getName());
>              throw ExceptionFactory.makeWebServiceException(msg, e);
>  +        } finally {
>  +            releaseAxisServiceResources();
>          }
>  +
>      }
>
>      EndpointDescriptionImpl(ServiceDescriptionImpl parent, String serviceImplName) {
>  @@ -536,6 +538,9 @@
>
>          // Configure any available WebServiceFeatures on the endpoint.
>          configureWebServiceFeatures();
>  +
>  +        // REVIEW: there are some throws above that won't cause the release
>  +        releaseAxisServiceResources();
>      }
>
>      /**
>  @@ -571,6 +576,8 @@
>          buildEndpointDescriptionFromAnnotations();
>
>          configureWebServiceFeatures();
>  +
>  +        releaseAxisServiceResources();
>
>          // The anonymous AxisOperations are currently NOT added here.  The reason
>          // is that (for now) this is a SERVER-SIDE code path, and the anonymous operations
>  @@ -1010,6 +1017,13 @@
>
>          //TODO: Set other things on AxisService here, this function may have to be
>          //      moved to after we create all the AxisOperations
>  +    }
>  +
>  +    private void releaseAxisServiceResources() {
>  +        // release the schema list in the AxisService
>  +        if (axisService != null) {
>  +            axisService.releaseSchemaList();
>  +        }
>      }
>
>      private void buildDescriptionHierachy() {
>
>
>
>  ---------------------------------------------------------------------
>  To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
>  For additional commands, e-mail: axis-cvs-help@ws.apache.org
>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: axis-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-dev-help@ws.apache.org