[Jboss-cvs] JBossAS SVN: r56438 - trunk/server/src/main/org/jboss/naming/client/java

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

Author: wolfc
Date: 2006-08-30 09:55:58 -0400 (Wed, 30 Aug 2006)
New Revision: 56438

Modified:
   trunk/server/src/main/org/jboss/naming/client/java/javaURLContextFactory.java
Log:
changed lookup order of clientCtx, because it might not be available (EJBTHREE-667)

Modified: trunk/server/src/main/org/jboss/naming/client/java/javaURLContextFactory.java
===================================================================
--- trunk/server/src/main/org/jboss/naming/client/java/javaURLContextFactory.java	2006-08-30 13:54:02 UTC (rev 56437)
+++ trunk/server/src/main/org/jboss/naming/client/java/javaURLContextFactory.java	2006-08-30 13:55:58 UTC (rev 56438)
@@ -125,11 +125,11 @@
          else
             name = (Name) args[0];
 
-         // Lookup the client application context from the server
-         Context clientCtx = (Context) lookupCtx.lookup(clientName);
          // Check for special objects not in the env
          if (name.size() < 2 || "java:comp".equals(name.get(0)) == false || "env".equals(name.get(1)) == false)
             return getSpecialObject(name);
+         // Lookup the client application context from the server
+         Context clientCtx = (Context) lookupCtx.lookup(clientName);
          // Strip the comp/env prefix
          Name bindingName = name.getSuffix(2);
          Object binding = clientCtx.lookup(bindingName);