AXIS-2935 apply fix for IOException in multi-threaded end user code

Robert Lazarski · Robert Lazarski · commit 026d7febb34f · 2019-12-08T01:16:07.000Z
diff --git a/axis-rt-core/src/main/java/org/apache/axis/configuration/FileProvider.java b/axis-rt-core/src/main/java/org/apache/axis/configuration/FileProvider.java
@@ -152,19 +152,20 @@ public void setSearchClasspath(boolean searchClasspath) {
     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 void configureEngine(AxisEngine engine)
                 deployment = defaultConfig.getDeployment();
             } else {
                 WSDDDocument doc = new WSDDDocument(XMLUtils.
-                                                    newDocument(getInputStream()));
+                                                    newDocument(configFileInputStream));
                 deployment = doc.getDeployment();
     
                 deployment.configureEngine(engine);
