You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by co...@hyperreal.org on 1999/10/11 04:42:37 UTC
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/core Context.java
costin 99/10/10 19:42:37
Modified: src/share/org/apache/jasper Options.java
src/share/org/apache/tomcat/core Context.java
Log:
Fixed minor JDK1.1 problem in Jasper.
Revision Changes Path
1.2 +9 -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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Options.java 1999/10/09 00:20:34 1.1
+++ Options.java 1999/10/11 02:42:32 1.2
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/Options.java,v 1.1 1999/10/09 00:20:34 duncan Exp $
- * $Revision: 1.1 $
- * $Date: 1999/10/09 00:20:34 $
+ * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/Options.java,v 1.2 1999/10/11 02:42:32 costin Exp $
+ * $Revision: 1.2 $
+ * $Date: 1999/10/11 02:42:32 $
*
* ====================================================================
*
@@ -102,7 +102,7 @@
* I want to see my generated servlets. Which directory are they
* in?
*/
- public File scratchDir = new File(System.getProperty("java.io.tmpdir"));
+ public File scratchDir;
/**
* Need to have this as is for versions 4 and 5 of IE. Can be set from
@@ -159,6 +159,11 @@
* ServletConfig and ServletContext.
*/
public Options(ServletConfig config, ServletContext context) {
+ // XXX it will be overriden latter, and JDK1.2 specific.
+ // can we remove it?
+ String scratchDirName=System.getProperty("java.io.tmpdir");
+ if( scratchDirName != null )
+ scratchDir = new File(scratchDirName );
String keepgen = config.getInitParameter("keepgenerated");
if (keepgen != null) {
if (keepgen.equalsIgnoreCase("true"))
1.2 +4 -3 jakarta-tomcat/src/share/org/apache/tomcat/core/Context.java
Index: Context.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/Context.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Context.java 1999/10/09 00:30:01 1.1
+++ Context.java 1999/10/11 02:42:36 1.2
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/Context.java,v 1.1 1999/10/09 00:30:01 duncan Exp $
- * $Revision: 1.1 $
- * $Date: 1999/10/09 00:30:01 $
+ * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/Context.java,v 1.2 1999/10/11 02:42:36 costin Exp $
+ * $Revision: 1.2 $
+ * $Date: 1999/10/11 02:42:36 $
*
* ====================================================================
*
@@ -926,6 +926,7 @@
try {
result.getWrapper().loadServlet();
} catch (Exception ee) {
+ ee.printStackTrace();
String msg = sm.getString("context.loadServlet.e",
servletName);