[jboss-cvs] JBossAS SVN: r77378 - projects/ejb3/trunk/proxy/src/main/java/org/jboss/ejb3/proxy/objectfactory.

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

Author: bstansberry at jboss.com
Date: 2008-08-23 10:32:21 -0400 (Sat, 23 Aug 2008)
New Revision: 77378

Modified:
   projects/ejb3/trunk/proxy/src/main/java/org/jboss/ejb3/proxy/objectfactory/ProxyObjectFactory.java
Log:
[EJBTHREE-1403] Temp fix to allow clustering unit tests to pass.

Modified: projects/ejb3/trunk/proxy/src/main/java/org/jboss/ejb3/proxy/objectfactory/ProxyObjectFactory.java
===================================================================
--- projects/ejb3/trunk/proxy/src/main/java/org/jboss/ejb3/proxy/objectfactory/ProxyObjectFactory.java	2008-08-23 09:44:18 UTC (rev 77377)
+++ projects/ejb3/trunk/proxy/src/main/java/org/jboss/ejb3/proxy/objectfactory/ProxyObjectFactory.java	2008-08-23 14:32:21 UTC (rev 77378)
@@ -122,19 +122,24 @@
          Ejb3Registrar registrar = Ejb3RegistrarLocator.locateRegistrar();
 
          // Local lookup succeeded, so use it
-         try
-         {
+         // BES 2008/08/22 -- a NotBoundException doesn't mean failure, just
+         // means the container isn't deployed in this server. So don't catch it
+         // in an inner try/catch; let it propagate to the outer catch.
+         // This may or may not be the proper fix for EJBTHREE-1403, but it allows
+         // clustering unit tests to pass.
+//         try
+//         {
             Object pfObj = registrar.lookup(proxyFactoryRegistryKey);
             assert pfObj != null : ProxyFactory.class.getName() + " from key " + proxyFactoryRegistryKey + " was null";
             assert pfObj instanceof ProxyFactory : " Object obtained from key " + proxyFactoryRegistryKey
                   + " was expected to be of type " + ProxyFactory.class.getName() + " but was instead " + pfObj;
             proxyFactory = (ProxyFactory) pfObj;
-         }
-         catch (NotBoundException nbe)
-         {
-            throw new RuntimeException("Could not obtain " + ProxyFactory.class.getSimpleName()
-                  + " from expected key \"" + proxyFactoryRegistryKey + "\"", nbe);
-         }
+//         }
+//         catch (NotBoundException nbe)
+//         {
+//            throw new RuntimeException("Could not obtain " + ProxyFactory.class.getSimpleName()
+//                  + " from expected key \"" + proxyFactoryRegistryKey + "\"", nbe);
+//         }
       }
       // Registrar is not local, so use Remoting to Obtain Proxy Factory
       catch (NotBoundException nbe)