[jboss-cvs] JBossAS SVN: r64715 - branches/JBoss_4_0_5_GA_JBAS-4574/naming/src/main/org/jnp/interfaces.

[jboss-cvs-commits at lists.jboss.org]

Author: bstansberry at jboss.com
Date: 2007-08-20 15:15:44 -0400 (Mon, 20 Aug 2007)
New Revision: 64715

Modified:
   branches/JBoss_4_0_5_GA_JBAS-4574/naming/src/main/org/jnp/interfaces/NamingContext.java
Log:
[JBAS-4574] Don't fix JBAS-4616 in a JBAS-4615 patch

Modified: branches/JBoss_4_0_5_GA_JBAS-4574/naming/src/main/org/jnp/interfaces/NamingContext.java
===================================================================
--- branches/JBoss_4_0_5_GA_JBAS-4574/naming/src/main/org/jnp/interfaces/NamingContext.java	2007-08-20 19:15:15 UTC (rev 64714)
+++ branches/JBoss_4_0_5_GA_JBAS-4574/naming/src/main/org/jnp/interfaces/NamingContext.java	2007-08-20 19:15:44 UTC (rev 64715)
@@ -1144,15 +1144,11 @@
    public Object lookupLink(Name name)
       throws NamingException
    {
+      // FIXME JBAS-4616      
+      
       if (name.isEmpty())
          return lookup(name);
       
-      Hashtable refEnv = getEnv(name);
-      checkRef(refEnv);
-      Name parsedName = (Name) refEnv.get(JNP_PARSED_NAME);
-      if (parsedName != null)
-         name = parsedName;
-
       Object link = null;
       try
       {
@@ -1164,7 +1160,8 @@
          catch (RemoteException re)
          {
             // Check for JBAS-4574.
-            if (handleStaleNamingStub(re, refEnv))
+            // TODO if we resolve JBAS-4616, need to use refEnv
+            if (handleStaleNamingStub(re, env))
             {
                // try again with new naming stub                  
                link = naming.lookup(n);