revert based on https://issues.apache.org/bugzilla/show_bug.cgi?id=47512#c4

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

diff --git a/java/org/apache/naming/NamingContext.java b/java/org/apache/naming/NamingContext.java
index 1e6b068..2bedf27 100644 (file)
--- a/java/org/apache/naming/NamingContext.java
+++ b/java/org/apache/naming/NamingContext.java
@@ -794,8 +794,13 @@ public class NamingContext implements Context {
                 }
             } else if (entry.type == NamingEntry.REFERENCE) {
                 try {
-                    return NamingManager.getObjectInstance
+                    Object obj = 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) {