From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 29 Jul 2010 07:52:07 +0000 (+0000)
Subject: Fix copy/paste typo
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=14e4b6c39cacbd6b74140eed47a4b77ca3b59aca;p=tomcat7.0

Fix copy/paste typo

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

diff --git a/java/org/apache/catalina/startup/WebRuleSet.java b/java/org/apache/catalina/startup/WebRuleSet.java
index 3f786c80f..fda97db3a 100644
--- a/java/org/apache/catalina/startup/WebRuleSet.java
+++ b/java/org/apache/catalina/startup/WebRuleSet.java
@@ -520,7 +520,7 @@ public class WebRuleSet extends RuleSetBase {
                 "setName", 0);
         digester.addCallMethod(fullPrefix + "/resource-env-ref/resource-env-ref-type",
                 "setType", 0);
-        configureInjectionRules(digester, "web-app/ejb-local-ref/");
+        configureInjectionRules(digester, "web-app/resource-env-ref/");
 
         //message-destination
         digester.addObjectCreate(fullPrefix + "/message-destination",
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 96a551b7b..75ee43591 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -193,6 +193,10 @@
         Handle the edge cases where resources packaged in JARs have names that
         start with a single quote character or a double quote character. (markt)
       </fix>
+      <fix>
+        Correct copy and paste typo in web.xml parsing rules that mixed up
+        <code>local-ejb-ref</code> and <code>resource-env-ref</code>. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Jasper">