svn commit: r733988 - in /ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2: SoapExternalService.java hooks/ODEAxisService.java

[midon]

Author: midon
Date: Mon Jan 12 17:51:39 2009
New Revision: 733988

URL: http://svn.apache.org/viewvc?rev=733988&view=rev
Log:
ODE-482: close open streams. Patch contributed by Alexey Ousov.

Modified:
    
ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/SoapExternalService.java
    
ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/hooks/ODEAxisService.java

Modified: 
ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/SoapExternalService.java
URL: 
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/SoapExternalService.java?rev=733988&r1=733987&r2=733988&view=diff
==============================================================================
--- 
ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/SoapExternalService.java
 (original)
+++ 
ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/SoapExternalService.java
 Mon Jan 12 17:51:39 2009
@@ -532,10 +532,14 @@
             init(); // create a new ServiceClient instance
             try {
                 InputStream ais = file.toURI().toURL().openStream();
-                if (ais != null) {
+                if (ais != null) {  
                     if (__log.isDebugEnabled()) __log.debug("Configuring 
service " + _serviceName + " using: " + file);
-                    ServiceBuilder builder = new ServiceBuilder(ais, 
_configContext, anonymousService);
-                    builder.populateService(builder.buildOM());
+                    try {
+                        ServiceBuilder builder = new ServiceBuilder(ais, 
_configContext, anonymousService);
+                        builder.populateService(builder.buildOM());
+                    } finally {
+                        ais.close();
+                    }
                     // do not allow the service.xml file to change the service 
name 
                     anonymousService.setName(serviceName);
 

Modified: 
ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/hooks/ODEAxisService.java
URL: 
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/hooks/ODEAxisService.java?rev=733988&r1=733987&r2=733988&view=diff
==============================================================================
--- 
ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/hooks/ODEAxisService.java
 (original)
+++ 
ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/hooks/ODEAxisService.java
 Mon Jan 12 17:51:39 2009
@@ -103,9 +103,13 @@
                 InputStream ais = axis2config.toURL().openStream();
                 if (ais != null) {
                     LOG.debug("Configuring service using: 
"+axis2config.toURL());
-                    ConfigurationContext configCtx = new 
ConfigurationContext(axisConfig);
-                    ServiceBuilder builder = new ServiceBuilder(ais, 
configCtx, axisService);
-                    builder.populateService(builder.buildOM());
+                    try {
+                        ConfigurationContext configCtx = new 
ConfigurationContext(axisConfig);
+                        ServiceBuilder builder = new ServiceBuilder(ais, 
configCtx, axisService);
+                        builder.populateService(builder.buildOM());
+                    } finally {
+                        ais.close();
+                    }
                 }
             } catch (FileNotFoundException except) {
                 LOG.debug("Axis2 service configuration not found: " + 
axis2config);