rubys 2002/06/03 07:19:46
Modified: java/src/org/apache/axis/configuration
ServletEngineConfigurationFactory.java
java/src/org/apache/axis/utils axisNLS.properties
Log:
Fix NPE in JRE when server-config.wsdd is not found.
Begs two questions:
(1) Should server-config.wsdd be required?
(2) Why isn't server-config.wsdd copied into ${build.webapp}?
Revision Changes Path
1.6 +5 -2
xml-axis/java/src/org/apache/axis/configuration/ServletEngineConfigurationFactory.java
Index: ServletEngineConfigurationFactory.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/configuration/ServletEngineConfigurationFactory.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ServletEngineConfigurationFactory.java 30 May 2002 23:46:00 -0000 1.5
+++ ServletEngineConfigurationFactory.java 3 Jun 2002 14:19:45 -0000 1.6
@@ -124,9 +124,12 @@
InputStream is = ctx.getResourceAsStream("/WEB-INF/"+
SERVER_CONFIG_FILE);
if (is == null) {
- // !!! THROW EXCEPTION
+ log.error(JavaUtils.getMessage
+ ("servletEngineWebInfError01",
+ webInfPath + "/" + SERVER_CONFIG_FILE));
+ } else {
+ config = new FileProvider(is);
}
- config = new FileProvider(is);
}
if ( config == null ) {
try {
1.4 +2 -1 xml-axis/java/src/org/apache/axis/utils/axisNLS.properties
Index: axisNLS.properties
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/utils/axisNLS.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- axisNLS.properties 31 May 2002 20:37:39 -0000 1.3
+++ axisNLS.properties 3 Jun 2002 14:19:46 -0000 1.4
@@ -537,6 +537,7 @@
serverStop00=Server is stopped
servletEngineWebInfError00=Problem with servlet engine /WEB-INF directory
+servletEngineWebInfError01=Problem with servlet engine config file: {0}
setCurrMsg00=Setting current message form to: {0} (current message is now {1})
setProp00=Setting {0} property in {1}
@@ -851,4 +852,4 @@
ftsf05=getAcceptedIssuers: none
j2woptStyle00=The style of binding in the WSDL. Values are DOCUMENT or LITERAL.
-j2woptBadStyle00=The value of --style must be DOCUMENT or LITERAL.
\ No newline at end of file
+j2woptBadStyle00=The value of --style must be DOCUMENT or LITERAL.
