You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by di...@apache.org on 2006/05/18 05:25:38 UTC

svn commit: r407446 - /webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java

Author: dims
Date: Wed May 17 20:25:38 2006
New Revision: 407446

URL: http://svn.apache.org/viewvc?rev=407446&view=rev
Log:
throw better exception and prevent NPE

Modified:
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java?rev=407446&r1=407445&r2=407446&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java Wed May 17 20:25:38 2006
@@ -65,8 +65,11 @@
                     }
                 }
             }
-
-
+            if(axisConfig == null) {
+                throw new RuntimeException("Unable to load axis2.xml configuration");
+            }
+            Parameter unableHttp = new Parameter("enableHTTP", "true");
+            axisConfig.addParameter(unableHttp);
         } catch (FileNotFoundException e) {
             log.info(e.getMessage());
         } catch (DeploymentException e) {
@@ -75,13 +78,6 @@
             log.info(e.getMessage());
         } catch (IOException e) {
             log.info(e.getMessage());
-        } finally {
-            try {
-                Parameter unableHttp = new Parameter("enableHTTP", "true");
-                axisConfig.addParameter(unableHttp);
-            } catch (AxisFault axisFault) {
-                log.info(axisFault.getMessage());
-            }
         }
     }