[jboss-cvs] JBossAS SVN: r79306 - in trunk: component-matrix and 1 other directory.

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

Author: scott.stark at jboss.org
Date: 2008-10-09 13:26:00 -0400 (Thu, 09 Oct 2008)
New Revision: 79306

Modified:
   trunk/cluster/src/main/org/jboss/ha/jndi/HAJNDI.java
   trunk/component-matrix/pom.xml
Log:
JBAS-6025, update jnpserver to 5.0.0.CR3

Modified: trunk/cluster/src/main/org/jboss/ha/jndi/HAJNDI.java
===================================================================
--- trunk/cluster/src/main/org/jboss/ha/jndi/HAJNDI.java	2008-10-09 16:48:35 UTC (rev 79305)
+++ trunk/cluster/src/main/org/jboss/ha/jndi/HAJNDI.java	2008-10-09 17:26:00 UTC (rev 79306)
@@ -118,9 +118,9 @@
       // So, what we do is cheat and get the static localServer variable
       try
       {
-         if (NamingContext.localServer != null)
+         if (NamingContext.getLocal() != null)
          {
-            return NamingContext.localServer.lookup(name);
+            return NamingContext.getLocal().lookup(name);
          }
 
          return new InitialContext().lookup(name);

Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2008-10-09 16:48:35 UTC (rev 79305)
+++ trunk/component-matrix/pom.xml	2008-10-09 17:26:00 UTC (rev 79306)
@@ -67,7 +67,7 @@
     <version.org.jboss.integration>5.0.0.CR2</version.org.jboss.integration>
     <version.org.jboss.jbossxb>2.0.0.CR15</version.org.jboss.jbossxb>
     <version.org.jboss.metadata>1.0.0.CR1</version.org.jboss.metadata>
-    <version.org.jboss.naming>5.0.0.CR2</version.org.jboss.naming>
+    <version.org.jboss.naming>5.0.0.CR3</version.org.jboss.naming>
     <version.org.jboss.remoting>2.5.0.GA</version.org.jboss.remoting>
     <version.org.jboss.security>2.0.2.CR6</version.org.jboss.security>
     <version.oswego-concurrent.concurrent>1.3.4-jboss-update1</version.oswego-concurrent.concurrent>