remm 2003/03/17 01:16:32
Modified: jasper2/src/share/org/apache/jasper/compiler Tag:
tomcat_4_branch Compiler.java
Log:
- Port patch from 5.x.
- Avoid a NPE when JSPC is used with built-in compilation (which can be useful
when working with individual JSPs).
Revision Changes Path
No revision
No revision
1.18.2.13 +6 -4
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Compiler.java
Index: Compiler.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Compiler.java,v
retrieving revision 1.18.2.12
retrieving revision 1.18.2.13
diff -u -r1.18.2.12 -r1.18.2.13
--- Compiler.java 17 Feb 2003 22:36:08 -0000 1.18.2.12
+++ Compiler.java 17 Mar 2003 09:16:32 -0000 1.18.2.13
@@ -161,7 +161,9 @@
logger.setMessageOutputLevel( Project.MSG_INFO );
}
project.addBuildListener( logger );
- project.setBasedir( System.getProperty("catalina.home"));
+ if (System.getProperty("catalina.home") != null) {
+ project.setBasedir( System.getProperty("catalina.home"));
+ }
if( options.getCompiler() != null ) {
Constants.jasperLog.log("Compiler " + options.getCompiler(),
Logger.INFORMATION);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
