From 0e374673fb6640349ac8a0f96a488b23767e4d79 Mon Sep 17 00:00:00 2001
From: funkman <funkman@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 4 Nov 2009 16:40:16 +0000
Subject: [PATCH] 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
---
 java/org/apache/naming/NamingContext.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/naming/NamingContext.java b/java/org/apache/naming/NamingContext.java
index 1e6b06884..2bedf2745 100644
--- 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) {
-- 
2.11.0