remm 01/11/12 17:04:04
Modified: catalina/src/share/org/apache/naming Tag: tomcat_40_branch
NamingContext.java
Log:
- Port the reference rebinding patch from the HEAD branch.
Revision Changes Path
No revision
No revision
1.3.2.3 +12 -5
jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/NamingContext.java
Index: NamingContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/NamingContext.java,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -u -r1.3.2.2 -r1.3.2.3
--- NamingContext.java 2001/10/24 04:35:29 1.3.2.2
+++ NamingContext.java 2001/11/13 01:04:04 1.3.2.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/NamingContext.java,v
1.3.2.2 2001/10/24 04:35:29 remm Exp $
- * $Revision: 1.3.2.2 $
- * $Date: 2001/10/24 04:35:29 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/NamingContext.java,v
1.3.2.3 2001/11/13 01:04:04 remm Exp $
+ * $Revision: 1.3.2.3 $
+ * $Date: 2001/11/13 01:04:04 $
*
* ====================================================================
*
@@ -85,7 +85,7 @@
* Catalina JNDI Context implementation.
*
* @author Remy Maucherat
- * @version $Revision: 1.3.2.2 $ $Date: 2001/10/24 04:35:29 $
+ * @version $Revision: 1.3.2.3 $ $Date: 2001/11/13 01:04:04 $
*/
public class NamingContext implements Context {
@@ -831,8 +831,15 @@
}
} 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) {
throw new NamingException(e.getMessage());
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
