From 0ee1dbeea4266ad1d3c27de0b91a30492dafba9f Mon Sep 17 00:00:00 2001 From: kkolinko Date: Wed, 24 Jun 2009 11:44:45 +0000 Subject: [PATCH] Do not evaluate the same string twice. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@787985 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/jasper/compiler/TagFileProcessor.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/java/org/apache/jasper/compiler/TagFileProcessor.java b/java/org/apache/jasper/compiler/TagFileProcessor.java index d6fe1c748..ed3a1e6e1 100644 --- a/java/org/apache/jasper/compiler/TagFileProcessor.java +++ b/java/org/apache/jasper/compiler/TagFileProcessor.java @@ -556,14 +556,15 @@ class TagFileProcessor { JspCompilationContext ctxt = compiler.getCompilationContext(); JspRuntimeContext rctxt = ctxt.getRuntimeContext(); - JspServletWrapper wrapper = rctxt.getWrapper(tagFileJarPath + tagFilePath); + String wrapperUri = tagFileJarPath + tagFilePath; + JspServletWrapper wrapper = rctxt.getWrapper(wrapperUri); synchronized (rctxt) { if (wrapper == null) { wrapper = new JspServletWrapper(ctxt.getServletContext(), ctxt .getOptions(), tagFilePath, tagInfo, ctxt .getRuntimeContext(), tagFileJarUrl); - rctxt.addWrapper(tagFileJarPath + tagFilePath, wrapper); + rctxt.addWrapper(wrapperUri, wrapper); // Use same classloader and classpath for compiling tag files wrapper.getJspEngineContext().setClassLoader( -- 2.11.0