[infinispan-commits] Infinispan SVN: r2532 - trunk/core/src/main/java/org/infinispan/remoting.

[infinispan-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2010-10-20 12:30:35 -0400 (Wed, 20 Oct 2010)
New Revision: 2532

Modified:
   trunk/core/src/main/java/org/infinispan/remoting/ReplicationQueue.java
   trunk/core/src/main/java/org/infinispan/remoting/ReplicationQueueImpl.java
Log:
ISPN-716 - ReplicationQueue.flush() should return the number of items flushed

Modified: trunk/core/src/main/java/org/infinispan/remoting/ReplicationQueue.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/remoting/ReplicationQueue.java	2010-10-20 16:29:29 UTC (rev 2531)
+++ trunk/core/src/main/java/org/infinispan/remoting/ReplicationQueue.java	2010-10-20 16:30:35 UTC (rev 2532)
@@ -66,9 +66,10 @@
    void add(ReplicableCommand job);
 
    /**
-    * Flushes existing jobs in the replication queue.
+    * Flushes existing jobs in the replication queue, and returns the number of jobs flushed.
+    * @return the number of jobs flushed
     */
-   void flush();
+   int flush();
 
    /**
     * @return the number of elements in the replication queue.

Modified: trunk/core/src/main/java/org/infinispan/remoting/ReplicationQueueImpl.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/remoting/ReplicationQueueImpl.java	2010-10-20 16:29:29 UTC (rev 2531)
+++ trunk/core/src/main/java/org/infinispan/remoting/ReplicationQueueImpl.java	2010-10-20 16:30:35 UTC (rev 2532)
@@ -112,7 +112,7 @@
    }
 
    @Override
-   public void flush() {
+   public int flush() {
       List<ReplicableCommand> toReplicate = new LinkedList<ReplicableCommand>();
       elements.drainTo(toReplicate);
       if (log.isTraceEnabled()) log.trace("flush(): flushing repl queue (num elements={0})", toReplicate.size());
@@ -129,6 +129,8 @@
             log.error("failed replicating " + toReplicate.size() + " elements in replication queue", t);
          }
       }
+
+      return toReplicateSize;
    }
 
    @Override