[infinispan-commits] Infinispan SVN: r2595 - in branches/4.2.x/core/src: main/java/org/infinispan/distribution and 3 other directories.

[infinispan-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2010-10-25 11:10:46 -0400 (Mon, 25 Oct 2010)
New Revision: 2595

Modified:
   branches/4.2.x/core/src/main/java/org/infinispan/affinity/ListenerRegistration.java
   branches/4.2.x/core/src/main/java/org/infinispan/distribution/DistributionManagerImpl.java
   branches/4.2.x/core/src/main/java/org/infinispan/loaders/decorators/SingletonStore.java
   branches/4.2.x/core/src/main/java/org/infinispan/transaction/xa/TransactionTable.java
   branches/4.2.x/core/src/test/java/org/infinispan/distribution/rehash/RehashAfterPartitionMergeTest.java
Log:
Removed superfluous @Merged annotations

Modified: branches/4.2.x/core/src/main/java/org/infinispan/affinity/ListenerRegistration.java
===================================================================
--- branches/4.2.x/core/src/main/java/org/infinispan/affinity/ListenerRegistration.java	2010-10-25 14:09:40 UTC (rev 2594)
+++ branches/4.2.x/core/src/main/java/org/infinispan/affinity/ListenerRegistration.java	2010-10-25 15:10:46 UTC (rev 2595)
@@ -22,7 +22,6 @@
    }
 
    @ViewChanged
-   @Merged
    public void handleViewChange(ViewChangedEvent vce) {
       keyAffinityService.handleViewChange(vce);
    }

Modified: branches/4.2.x/core/src/main/java/org/infinispan/distribution/DistributionManagerImpl.java
===================================================================
--- branches/4.2.x/core/src/main/java/org/infinispan/distribution/DistributionManagerImpl.java	2010-10-25 14:09:40 UTC (rev 2594)
+++ branches/4.2.x/core/src/main/java/org/infinispan/distribution/DistributionManagerImpl.java	2010-10-25 15:10:46 UTC (rev 2595)
@@ -394,7 +394,6 @@
    public class ViewChangeListener {
       
       @ViewChanged
-      @Merged
       public void handleViewChange(ViewChangedEvent e) {
          log.trace("view change received. Needs to re-join? " + e.isNeedsToRejoin());         
          boolean started;

Modified: branches/4.2.x/core/src/main/java/org/infinispan/loaders/decorators/SingletonStore.java
===================================================================
--- branches/4.2.x/core/src/main/java/org/infinispan/loaders/decorators/SingletonStore.java	2010-10-25 14:09:40 UTC (rev 2594)
+++ branches/4.2.x/core/src/main/java/org/infinispan/loaders/decorators/SingletonStore.java	2010-10-25 15:10:46 UTC (rev 2595)
@@ -327,7 +327,6 @@
        * became the coordinator. This method will report any issues that could potentially arise from this push.
        */
       @ViewChanged
-      @Merged
       public void viewChange(ViewChangedEvent event) {
          boolean tmp = isCoordinator(event.getNewMembers(), event.getLocalAddress());
 

Modified: branches/4.2.x/core/src/main/java/org/infinispan/transaction/xa/TransactionTable.java
===================================================================
--- branches/4.2.x/core/src/main/java/org/infinispan/transaction/xa/TransactionTable.java	2010-10-25 14:09:40 UTC (rev 2594)
+++ branches/4.2.x/core/src/main/java/org/infinispan/transaction/xa/TransactionTable.java	2010-10-25 15:10:46 UTC (rev 2595)
@@ -94,7 +94,6 @@
    public class StaleTransactionCleanup {
       
       @ViewChanged
-      @Merged
       public void onViewChange(ViewChangedEvent vce) {
          final List<Address> leavers = MembershipArithmetic.getMembersLeft(vce.getOldMembers(), vce.getNewMembers());
          if (!leavers.isEmpty()) {

Modified: branches/4.2.x/core/src/test/java/org/infinispan/distribution/rehash/RehashAfterPartitionMergeTest.java
===================================================================
--- branches/4.2.x/core/src/test/java/org/infinispan/distribution/rehash/RehashAfterPartitionMergeTest.java	2010-10-25 14:09:40 UTC (rev 2594)
+++ branches/4.2.x/core/src/test/java/org/infinispan/distribution/rehash/RehashAfterPartitionMergeTest.java	2010-10-25 15:10:46 UTC (rev 2595)
@@ -97,10 +97,5 @@
       public void handle(ViewChangedEvent e) {
          ai.getAndIncrement();
       }
-      
-      @Merged
-      public void merged(MergeEvent e){
-         ai.getAndIncrement();
-      }
    }
 }