From: funkman <funkman@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 4 Nov 2009 01:18:08 +0000 (+0000)
Subject: Binding java.lang.reflect.Proxy to JNDI directory raises java.lang.ClassCastException
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=35d01026081e653889c636a3f5ce26d6d041a7ca;p=tomcat7.0

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 b22f12384..1e6b06884 100644
--- 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) {