- Reset the elContext field after use.

- Submitted by Scott Johnson and Stan Silvert.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@439494 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/jasper/runtime/JspApplicationContextImpl.java b/java/org/apache/jasper/runtime/JspApplicationContextImpl.java
index ec4e7e4..86e582c 100644 (file)
--- a/java/org/apache/jasper/runtime/JspApplicationContextImpl.java
+++ b/java/org/apache/jasper/runtime/JspApplicationContextImpl.java
@@ -45,7 +45,7 @@ import org.apache.jasper.el.ELContextImpl;
  */
 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();
 

diff --git a/java/org/apache/jasper/runtime/PageContextImpl.java b/java/org/apache/jasper/runtime/PageContextImpl.java
index 5008c1a..6394373 100644 (file)
--- a/java/org/apache/jasper/runtime/PageContextImpl.java
+++ b/java/org/apache/jasper/runtime/PageContextImpl.java
@@ -212,6 +212,8 @@ public class PageContextImpl extends PageContext {
                servlet = null;
                config = null;
                context = null;
+        applicationContext = null;
+        elContext = null;
                needsSession = false;
                errorPageURL = null;
                bufferSize = JspWriter.DEFAULT_BUFFER;

diff --git a/java/org/apache/jasper/servlet/JspServletWrapper.java b/java/org/apache/jasper/servlet/JspServletWrapper.java
index d1f98dd..6676389 100644 (file)
--- a/java/org/apache/jasper/servlet/JspServletWrapper.java
+++ b/java/org/apache/jasper/servlet/JspServletWrapper.java
@@ -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;