[jboss-cvs] JBossAS SVN: r72175 - in projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3: stateful and 1 other directories.

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

Author: ALRubinger
Date: 2008-04-14 09:19:15 -0400 (Mon, 14 Apr 2008)
New Revision: 72175

Modified:
   projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/session/BaseSessionProxyFactory.java
   projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateful/StatefulClusterProxyFactory.java
   projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateless/StatelessClusterProxyFactory.java
Log:
[EJBTHREE-1271] Bug fix to address improper NotImplementedException in Clustering ProxyFactories

Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/session/BaseSessionProxyFactory.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/session/BaseSessionProxyFactory.java	2008-04-14 13:11:23 UTC (rev 72174)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/session/BaseSessionProxyFactory.java	2008-04-14 13:19:15 UTC (rev 72175)
@@ -318,7 +318,11 @@
             // If binding home with local business 
             if(this.bindHomeAndBusinessTogether())
             {
-               intfs.add(this.getHomeType());
+               Class<?> home = this.getHomeType();
+               if (home != null)
+               {
+                  intfs.add(home);
+               }
             }
          }
          // If EJBLocalObject
@@ -348,7 +352,11 @@
             // If binding home with remote business
             if(this.bindHomeAndBusinessTogether())
             {
-               intfs.add(this.getHomeType());
+               Class<?> home = this.getHomeType();
+               if (home != null)
+               {
+                  intfs.add(home);
+               }
             }
             
          }

Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateful/StatefulClusterProxyFactory.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateful/StatefulClusterProxyFactory.java	2008-04-14 13:11:23 UTC (rev 72174)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateful/StatefulClusterProxyFactory.java	2008-04-14 13:19:15 UTC (rev 72175)
@@ -92,7 +92,8 @@
    @Override
    protected Class<?> getHomeType()
    {
-      throw new NotImplementedException("Cluster Proxy Factories do not have Home interfaces");
+      // Not Supported
+      return null;
    }
    
    /**
@@ -113,7 +114,8 @@
    @Override
    protected boolean bindHomeAndBusinessTogether()
    {
-      throw new NotImplementedException("Not Applicable for Cluster Proxy Factories");
+      // Not Supported
+      return false;
    }
    
    protected void validateEjb21Views()

Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateless/StatelessClusterProxyFactory.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateless/StatelessClusterProxyFactory.java	2008-04-14 13:11:23 UTC (rev 72174)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateless/StatelessClusterProxyFactory.java	2008-04-14 13:19:15 UTC (rev 72175)
@@ -155,7 +155,8 @@
     */
    @Override
    protected boolean bindHomeAndBusinessTogether(){
-      throw new NotImplementedException("Not Applicable for Cluster Proxy Factories");
+      // Not Supported
+      return false;
    }
    
    public synchronized void replicantsChanged (String key, 
@@ -188,7 +189,8 @@
    @Override
    protected Class<?> getHomeType()
    {
-      throw new NotImplementedException("Cluster Proxy Factories do not have Home interfaces");
+      // Not Supported
+      return null;
    }
 
    @Override