From 085167944913d927f40b3e5e9c405150a8917cb8 Mon Sep 17 00:00:00 2001 From: remm Date: Fri, 1 Sep 2006 22:37:38 +0000 Subject: [PATCH] - 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 --- java/org/apache/jasper/runtime/JspApplicationContextImpl.java | 2 +- java/org/apache/jasper/runtime/PageContextImpl.java | 2 ++ java/org/apache/jasper/servlet/JspServletWrapper.java | 3 +-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/java/org/apache/jasper/runtime/JspApplicationContextImpl.java b/java/org/apache/jasper/runtime/JspApplicationContextImpl.java index ec4e7e4df..86e582cd7 100644 --- 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 5008c1a89..6394373f2 100644 --- 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 d1f98dd10..6676389e7 100644 --- 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; -- 2.11.0