From: kkolinko <kkolinko@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 22 Oct 2010 21:59:51 +0000 (+0000)
Subject: Revert part of r1026157
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=4cc67ca714a09e56ed8783e2f66aaa26c224f897;p=tomcat7.0

Revert part of r1026157

Removing "throwa NamingException" from parseName() methods as was done in r1026157 changed their API,
so that derived classes won't be able to throw that exception anymore.

I do not know the full story behind these two parseName() methods, but if they were supposed be overwritten it seems likely that they may throw a NamingException.

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

diff --git a/java/org/apache/naming/resources/ProxyDirContext.java b/java/org/apache/naming/resources/ProxyDirContext.java
index f91dc804b..10b589131 100644
--- a/java/org/apache/naming/resources/ProxyDirContext.java
+++ b/java/org/apache/naming/resources/ProxyDirContext.java
@@ -1469,7 +1469,7 @@ public class ProxyDirContext implements DirContext {
      * 
      * @return the parsed name
      */
-    protected String parseName(String name) {
+    protected String parseName(String name) throws NamingException {
         return name;
     }
 
@@ -1479,7 +1479,7 @@ public class ProxyDirContext implements DirContext {
      * 
      * @return the parsed name
      */
-    protected Name parseName(Name name) {
+    protected Name parseName(Name name) throws NamingException {
         return name;
     }