svn commit: r832638 - /tomcat/trunk/java/org/apache/naming/NamingContext.java

[Tim Funk-2]

Author: funkman
Date: Wed Nov  4 01:18:08 2009
New Revision: 832638

URL: http://svn.apache.org/viewvc?rev=832638&view=rev
Log:
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


Modified:
    tomcat/trunk/java/org/apache/naming/NamingContext.java

Modified: tomcat/trunk/java/org/apache/naming/NamingContext.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/NamingContext.java?rev=832638&r1=832637&r2=832638&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/NamingContext.java (original)
+++ tomcat/trunk/java/org/apache/naming/NamingContext.java Wed Nov  4 01:18:08 2009
@@ -794,13 +794,8 @@
                 }
             } 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) {



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...