You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ru...@locus.apache.org on 2000/01/08 18:57:17 UTC
cvs commit: jakarta-tomcat/src/share/org/apache/jasper Options.java
rubys 00/01/08 09:57:17
Modified: src/share/org/apache/jasper Options.java
Log:
This patch fixes a rare problem that can happen when a non Java1.2, non
servlet 2.2 container is used with tomcat and no scratchdir property is
specified.
Submitted by: dIon Gillard <di...@multitask.com.au>
Revision Changes Path
1.6 +5 -4 jakarta-tomcat/src/share/org/apache/jasper/Options.java
Index: Options.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/Options.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Options.java 1999/12/28 13:25:31 1.5
+++ Options.java 2000/01/08 17:57:16 1.6
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/Options.java,v 1.5 1999/12/28 13:25:31 rubys Exp $
- * $Revision: 1.5 $
- * $Date: 1999/12/28 13:25:31 $
+ * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/Options.java,v 1.6 2000/01/08 17:57:16 rubys Exp $
+ * $Revision: 1.6 $
+ * $Date: 2000/01/08 17:57:16 $
*
* ====================================================================
*
@@ -242,7 +242,8 @@
// Not running in a Servlet 2.2 container.
// Try to get the JDK 1.2 java.io.tmpdir property
dir = System.getProperty("java.io.tmpdir");
- scratchDir = new File(dir);
+ if (dir != null)
+ scratchDir = new File(dir);
}
}