[exo-jcr-commits] exo-jcr SVN: r3722 - kernel/trunk/exo.kernel.component.common/src/test/java/org/exoplatform/services/rpc/impl.

[do-not-reply at jboss.org]

Author: nfilotto
Date: 2010-12-23 16:26:50 -0500 (Thu, 23 Dec 2010)
New Revision: 3722

Modified:
   kernel/trunk/exo.kernel.component.common/src/test/java/org/exoplatform/services/rpc/impl/TestRPCServiceImpl.java
Log:
EXOJCR-1073: Unit Test fixed

Modified: kernel/trunk/exo.kernel.component.common/src/test/java/org/exoplatform/services/rpc/impl/TestRPCServiceImpl.java
===================================================================
--- kernel/trunk/exo.kernel.component.common/src/test/java/org/exoplatform/services/rpc/impl/TestRPCServiceImpl.java	2010-12-23 15:19:02 UTC (rev 3721)
+++ kernel/trunk/exo.kernel.component.common/src/test/java/org/exoplatform/services/rpc/impl/TestRPCServiceImpl.java	2010-12-23 21:26:50 UTC (rev 3722)
@@ -18,13 +18,6 @@
  */
 package org.exoplatform.services.rpc.impl;
 
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Vector;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.atomic.AtomicReference;
-
 import org.exoplatform.container.PortalContainer;
 import org.exoplatform.container.configuration.ConfigurationManager;
 import org.exoplatform.container.xml.InitParams;
@@ -38,6 +31,13 @@
 import org.exoplatform.test.BasicTestCase;
 import org.jgroups.Address;
 
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Vector;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.atomic.AtomicReference;
+
 /**
  * This is the unit test class for the service {@link RPCServiceImpl}
  * 
@@ -1189,7 +1189,7 @@
       private boolean isCoordinator;
       private int count;
 
-      private CountDownLatch lock;
+      private CountDownLatch lock = new CountDownLatch(2);
       
       /**
        * @see org.exoplatform.services.rpc.TopologyChangeListener#onChange(org.exoplatform.services.rpc.TopologyChangeEvent)
@@ -1200,15 +1200,11 @@
          this.isCoordinator = event.isCoordinator();
          count++;
          
-         if (lock != null)
-         {
-            lock.countDown();
-         }
+         lock.countDown();
       }
 
       public void waitTopologyChange() throws InterruptedException
       {
-         lock = new CountDownLatch(1);
          lock.await();
       }
    }