You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xu...@apache.org on 2011/08/23 16:30:54 UTC
svn commit: r1160711 -
/geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/GeronimoConfigurator.java
Author: xuhaihong
Date: Tue Aug 23 14:30:53 2011
New Revision: 1160711
URL: http://svn.apache.org/viewvc?rev=1160711&view=rev
Log:
Failover to default geronimo-axis2.xml file if not find with context classloader
Modified:
geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/GeronimoConfigurator.java
Modified: geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/GeronimoConfigurator.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/GeronimoConfigurator.java?rev=1160711&r1=1160710&r2=1160711&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/GeronimoConfigurator.java (original)
+++ geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/GeronimoConfigurator.java Tue Aug 23 14:30:53 2011
@@ -37,7 +37,10 @@ public class GeronimoConfigurator extend
public synchronized AxisConfiguration getAxisConfiguration() throws AxisFault {
InputStream configStream = Loader.getResourceAsStream(this.resourceName);
if (configStream == null) {
- throw new AxisFault("Unable to find configuration: " + this.resourceName);
+ configStream = GeronimoConfigurator.class.getClassLoader().getResourceAsStream(this.resourceName);
+ if (configStream == null) {
+ throw new AxisFault("Unable to find configuration: " + this.resourceName);
+ }
}
this.axisConfig = populateAxisConfiguration(configStream);