Binding java.lang.reflect.Proxy to JNDI directory raises java.lang.ClassCastException

https://issues.apache.org/bugzilla/show_bug.cgi?id=47512

Also acts as dead code removal

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

diff --git a/java/org/apache/naming/NamingContext.java b/java/org/apache/naming/NamingContext.java
index b22f123..1e6b068 100644 (file)
--- a/java/org/apache/naming/NamingContext.java
+++ b/java/org/apache/naming/NamingContext.java
@@ -794,13 +794,8 @@ public class NamingContext implements Context {
                 }
             } else if (entry.type == NamingEntry.REFERENCE) {
                 try {
-                    Object obj = NamingManager.getObjectInstance
+                    return NamingManager.getObjectInstance
                         (entry.value, name, this, env);
-                    if (obj != null) {
-                        entry.value = obj;
-                        entry.type = NamingEntry.ENTRY;
-                    }
-                    return obj;
                 } catch (NamingException e) {
                     throw e;
                 } catch (Exception e) {