jfclere 2002/07/11 06:47:02
Modified: catalina/src/share/org/apache/catalina/startup
BootstrapService.java
Log:
Prevent NPE when DaemonContext is not well initialised.
Revision Changes Path
1.16 +9 -7
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/BootstrapService.java
Index: BootstrapService.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/BootstrapService.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- BootstrapService.java 9 Jul 2002 10:46:16 -0000 1.15
+++ BootstrapService.java 11 Jul 2002 13:47:02 -0000 1.16
@@ -128,9 +128,11 @@
/* Read the arguments from the Daemon context */
if (context!=null) {
arguments = context.getArguments();
- for (int i = 0; i < arguments.length; i++) {
- if (arguments[i].equals("-debug")) {
- debug = 1;
+ if (arguments!=null) {
+ for (int i = 0; i < arguments.length; i++) {
+ if (arguments[i].equals("-debug")) {
+ debug = 1;
+ }
}
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
