[jboss-cvs] JBossAS SVN: r76160 - projects/naming/trunk/jnpserver/src/main/java/org/jnp/interfaces.

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

Author: bstansberry at jboss.com
Date: 2008-07-23 22:05:10 -0400 (Wed, 23 Jul 2008)
New Revision: 76160

Modified:
   projects/naming/trunk/jnpserver/src/main/java/org/jnp/interfaces/NamingContext.java
Log:
[JBNAME-3] lookupLink() acquires stub to server Naming service

Modified: projects/naming/trunk/jnpserver/src/main/java/org/jnp/interfaces/NamingContext.java
===================================================================
--- projects/naming/trunk/jnpserver/src/main/java/org/jnp/interfaces/NamingContext.java	2008-07-24 01:40:08 UTC (rev 76159)
+++ projects/naming/trunk/jnpserver/src/main/java/org/jnp/interfaces/NamingContext.java	2008-07-24 02:05:10 UTC (rev 76160)
@@ -1154,8 +1154,12 @@
    public Object lookupLink(Name name)
       throws NamingException
    {
-      // FIXME JBAS-4616
-      
+      Hashtable refEnv = getEnv(name);
+      checkRef(refEnv);
+      Name parsedName = (Name) refEnv.get(JNP_PARSED_NAME);
+      if (parsedName != null)
+         name = parsedName;
+
       if (name.isEmpty())
          return lookup(name);
 
@@ -1170,8 +1174,7 @@
          catch (RemoteException re)
          {
             // Check for JBAS-4574.
-            // TODO if we resolve JBAS-4616, need to use refEnv
-            if (handleStaleNamingStub(re, env))
+            if (handleStaleNamingStub(re, refEnv))
             {
                // try again with new naming stub                  
                link = naming.lookup(n);
@@ -1189,7 +1192,7 @@
       catch (IOException e)
       {
          naming = null;
-         removeServer(env);
+         removeServer(refEnv);
          NamingException ex = new CommunicationException();
          ex.setRootCause(e);
          throw ex;