tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject svn commit: r439494 - in /tomcat/tc6.0.x/trunk/java/org/apache/jasper: runtime/JspApplicationContextImpl.java runtime/PageContextImpl.java servlet/JspServletWrapper.java
Date Fri, 01 Sep 2006 22:37:45 GMT
Author: remm
Date: Fri Sep  1 15:37:38 2006
New Revision: 439494

URL: http://svn.apache.org/viewvc?rev=439494&view=rev
Log:
- Reset the elContext field after use.
- Submitted by Scott Johnson and Stan Silvert.

Modified:
    tomcat/tc6.0.x/trunk/java/org/apache/jasper/runtime/JspApplicationContextImpl.java
    tomcat/tc6.0.x/trunk/java/org/apache/jasper/runtime/PageContextImpl.java
    tomcat/tc6.0.x/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java

Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/runtime/JspApplicationContextImpl.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/runtime/JspApplicationContextImpl.java?rev=439494&r1=439493&r2=439494&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/runtime/JspApplicationContextImpl.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/runtime/JspApplicationContextImpl.java Fri
Sep  1 15:37:38 2006
@@ -45,7 +45,7 @@
  */
 public class JspApplicationContextImpl implements JspApplicationContext {
 
-	private final static String KEY = JspApplicationContext.class.getName();
+	private final static String KEY = JspApplicationContextImpl.class.getName();
 
 	private final static ExpressionFactory expressionFactory = new ExpressionFactoryImpl();
 

Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/runtime/PageContextImpl.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/runtime/PageContextImpl.java?rev=439494&r1=439493&r2=439494&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/runtime/PageContextImpl.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/runtime/PageContextImpl.java Fri Sep  1 15:37:38
2006
@@ -212,6 +212,8 @@
 		servlet = null;
 		config = null;
 		context = null;
+        applicationContext = null;
+        elContext = null;
 		needsSession = false;
 		errorPageURL = null;
 		bufferSize = JspWriter.DEFAULT_BUFFER;

Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java?rev=439494&r1=439493&r2=439494&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java Fri Sep  1
15:37:38 2006
@@ -17,12 +17,11 @@
 package org.apache.jasper.servlet;
 
 import java.io.BufferedReader;
-import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.io.IOException;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message