[jboss-cvs] JBossAS SVN: r77740 - in projects/metadata/trunk/src: main/java/org/jboss/metadata/ejb/jboss and 1 other directories.

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

Author: emuckenhuber
Date: 2008-09-01 04:17:28 -0400 (Mon, 01 Sep 2008)
New Revision: 77740

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/jboss/JBossClusteredProcessor.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanMetaData.java
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/JBossAnnotationEjb3UnitTestCase.java
Log:
[JBMETA-100] merge isClustered.

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/jboss/JBossClusteredProcessor.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/jboss/JBossClusteredProcessor.java	2008-09-01 08:13:24 UTC (rev 77739)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/jboss/JBossClusteredProcessor.java	2008-09-01 08:17:28 UTC (rev 77740)
@@ -63,6 +63,7 @@
       clustered.setDescriptions(ProcessorUtils.getDescription(" @Clustered for bean: " + type));
       
       metaData.setClusterConfig(clustered);
+      metaData.setClustered(true);
    }
 
    public Collection<Class<? extends Annotation>> getAnnotationTypes()

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanMetaData.java	2008-09-01 08:13:24 UTC (rev 77739)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanMetaData.java	2008-09-01 08:17:28 UTC (rev 77740)
@@ -115,7 +115,7 @@
    private List<RemoteBindingMetaData> remoteBindings;
    
    /** Whether this bean is clustered */
-   private boolean clustered;
+   private Boolean clustered;
    
    /** The cluster config */
    private ClusterConfigMetaData clusterConfig;
@@ -705,7 +705,8 @@
     */
    public boolean isClustered()
    {
-      return clustered;
+      if(clustered == null) return false;
+      return clustered.booleanValue();
    }
 
    /**
@@ -715,7 +716,7 @@
     */
    public void setClustered(boolean clustered)
    {
-      this.clustered = clustered;
+      this.clustered = new Boolean(clustered);
    }
 
    /**
@@ -940,8 +941,10 @@
             localHomeJndiName = joverride.getLocalHomeJndiName();
          // callByValue
          callByValue = joverride.isCallByValue();
+         
          // clustered
-         clustered = joverride.isClustered();
+         if(joverride.clustered != null)
+            clustered = joverride.clustered;
          // remoteBindings
          if(joverride.getRemoteBindings() != null)
             remoteBindings = joverride.getRemoteBindings();
@@ -1103,10 +1106,10 @@
       else if(soriginal != null)
          callByValue = soriginal.isCallByValue();
       // Clustered
-      if(joverride != null)
-         clustered = joverride.isClustered();
-      else if(soriginal != null)
-         clustered = soriginal.isClustered();
+      if(joverride != null && joverride.clustered != null)
+         clustered = joverride.clustered;
+      else if(soriginal != null && soriginal.clustered != null)
+         clustered = soriginal.clustered;
          
       // aroundInvokes (needs to be additive)
       AroundInvokesMetaData overrideAroundInvokes = null;

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/JBossAnnotationEjb3UnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/JBossAnnotationEjb3UnitTestCase.java	2008-09-01 08:13:24 UTC (rev 77739)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/JBossAnnotationEjb3UnitTestCase.java	2008-09-01 08:17:28 UTC (rev 77740)
@@ -690,6 +690,7 @@
       
       // @Clustered
       assertNotNull(bean.getClusterConfig());
+      assertTrue(bean.isClustered());
       ClusterConfigMetaData clusterConfig = bean.getClusterConfig();
       assertEquals("home", clusterConfig.getHomeLoadBalancePolicy());
       assertEquals("bean", clusterConfig.getBeanLoadBalancePolicy());