svn commit: r1871014 - /axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/configuration/FileProvider.java

[robertlazarski]

Author: robertlazarski
Date: Sun Dec  8 01:16:07 2019
New Revision: 1871014

URL: http://svn.apache.org/viewvc?rev=1871014&view=rev
Log:
AXIS-2935 apply fix for IOException in multi-threaded end user code

Modified:
    
axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/configuration/FileProvider.java

Modified: 
axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/configuration/FileProvider.java
URL: 
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/configuration/FileProvider.java?rev=1871014&r1=1871013&r2=1871014&view=diff
==============================================================================
--- 
axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/configuration/FileProvider.java
 (original)
+++ 
axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/configuration/FileProvider.java
 Sun Dec  8 01:16:07 2019
@@ -152,19 +152,20 @@ public class FileProvider extends Delega
     public void configureEngine(AxisEngine engine)
         throws ConfigurationException {
         try {
-            if (getInputStream() == null) {
+            InputStream configFileInputStream = getInputStream();
+            if (configFileInputStream == null) {
                 try {
-                    setInputStream(new FileInputStream(configFile));
+                    configFileInputStream = new FileInputStream(configFile);
                 } catch (Exception e) {
                     // Ignore and continue
                 }
             }
-            if (getInputStream() == null && searchClasspath) {
+            if (configFileInputStream == null && searchClasspath) {
                 // Attempt to load the file from the classpath
-                setInputStream(ClassUtils.getResourceAsStream(filename, 
engine.getClass().getClassLoader()));
+                configFileInputStream = 
ClassUtils.getResourceAsStream(filename, engine.getClass().getClassLoader());
             }
 
-            if (getInputStream() == null) {
+            if (configFileInputStream == null) {
                 // Load the default configuration. This piece of code provides 
compatibility with Axis 1.4,
                 // which ends up loading 
org/apache/axis/(client|server)/(client|server)-config.wsdd if
                 // (1) filename is (client|server)-config.wsdd;
@@ -184,7 +185,7 @@ public class FileProvider extends Delega
                 deployment = defaultConfig.getDeployment();
             } else {
                 WSDDDocument doc = new WSDDDocument(XMLUtils.
-                                                    
newDocument(getInputStream()));
+                                                    
newDocument(configFileInputStream));
                 deployment = doc.getDeployment();
     
                 deployment.configureEngine(engine);