Author: funkman
Date: Wed Nov 4 16:40:16 2009
New Revision: 832792
URL: http://svn.apache.org/viewvc?rev=832792&view=rev
Log:
revert based on https://issues.apache.org/bugzilla/show_bug.cgi?id=47512#c4
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=832792&r1=832791&r2=832792&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/NamingContext.java (original)
+++ tomcat/trunk/java/org/apache/naming/NamingContext.java Wed Nov 4 16:40:16
2009
@@ -794,8 +794,13 @@
}
} 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) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
