From: kkolinko <kkolinko@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 24 Jun 2009 11:44:45 +0000 (+0000)
Subject: Do not evaluate the same string twice.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=0ee1dbeea4266ad1d3c27de0b91a30492dafba9f;p=tomcat7.0

Do not evaluate the same string twice.

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

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(