cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/naming NamingContext.java

[remm]

remm        01/10/01 22:55:18

  Modified:    catalina/src/share/org/apache/naming NamingContext.java
  Log:
  - Update the entry value after resolving the reference (experimental change).
  
  Revision  Changes    Path
  1.5       +9 -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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- NamingContext.java        2001/09/18 22:30:01     1.4
  +++ NamingContext.java        2001/10/02 05:55:18     1.5
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/NamingContext.java,v 
1.4 2001/09/18 22:30:01 remm Exp $
  - * $Revision: 1.4 $
  - * $Date: 2001/09/18 22:30:01 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/NamingContext.java,v 
1.5 2001/10/02 05:55:18 remm Exp $
  + * $Revision: 1.5 $
  + * $Date: 2001/10/02 05:55:18 $
    *
    * ====================================================================
    *
  @@ -85,7 +85,7 @@
    * Catalina JNDI Context implementation.
    *
    * @author Remy Maucherat
  - * @version $Revision: 1.4 $ $Date: 2001/09/18 22:30:01 $
  + * @version $Revision: 1.5 $ $Date: 2001/10/02 05:55:18 $
    */
   
   public class NamingContext implements Context {
  @@ -831,8 +831,12 @@
                   }
               } 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;
  +                    }
  +                    return obj;
                   } catch (Exception e) {
                       throw new NamingException(e.getMessage());
                   }