melaquias 01/03/19 07:49:29
Modified: src/share/org/apache/jasper/servlet JasperLoader.java
Log:
fixed bug where, in some cases (such as when Jasper is used as standalone
servlet) calling JasperLoader.toString() caused NullPointerException. Should
ALWAYS be able to invoke toString() safely on a non-null Object.
Revision Changes Path
1.3 +3 -1
jakarta-tomcat/src/share/org/apache/jasper/servlet/JasperLoader.java
Index: JasperLoader.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/servlet/JasperLoader.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JasperLoader.java 2000/09/29 07:00:44 1.2
+++ JasperLoader.java 2001/03/19 15:49:29 1.3
@@ -321,7 +321,9 @@
}
public String toString() {
- return "JspLoader( " + options.getScratchDir() + " ) / " + parent;
+ Object obj = (options==null)?null: options.getScratchDir();
+ String s = (obj==null)?"null":obj.toString();
+ return "JspLoader@"+hashCode()+"( " + s + " ) / " + parent;
}
boolean loadJSP(JspServlet jspS, String name, String classpath,
