[infinispan-commits] Infinispan SVN: r1771 - in trunk/core/src/main/java/org/infinispan: util/concurrent and 1 other directory.

[infinispan-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2010-05-11 06:47:56 -0400 (Tue, 11 May 2010)
New Revision: 1771

Added:
   trunk/core/src/main/java/org/infinispan/util/concurrent/AbstractInProcessFuture.java
   trunk/core/src/main/java/org/infinispan/util/concurrent/AbstractInProcessNotifyingFuture.java
Modified:
   trunk/core/src/main/java/org/infinispan/CacheDelegate.java
Log:
Abstract stuff

Modified: trunk/core/src/main/java/org/infinispan/CacheDelegate.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/CacheDelegate.java	2010-05-11 10:26:28 UTC (rev 1770)
+++ trunk/core/src/main/java/org/infinispan/CacheDelegate.java	2010-05-11 10:47:56 UTC (rev 1771)
@@ -63,6 +63,7 @@
 import org.infinispan.statetransfer.StateTransferManager;
 import org.infinispan.stats.Stats;
 import org.infinispan.stats.StatsImpl;
+import org.infinispan.util.concurrent.AbstractInProcessNotifyingFuture;
 import org.infinispan.util.concurrent.FutureListener;
 import org.infinispan.util.concurrent.NotifyingFuture;
 import org.infinispan.util.logging.Log;
@@ -457,32 +458,11 @@
       if (retval instanceof NotifyingFuture) {
          return (NotifyingFuture<X>) retval;
       } else {
-         return new NotifyingFuture<X>() {
-            public boolean cancel(boolean mayInterruptIfRunning) {
-               return true;
-            }
-
-            public boolean isCancelled() {
-               return false;
-            }
-
-            public boolean isDone() {
-               return true;
-            }
-
+         return new AbstractInProcessNotifyingFuture<X>() {
             @SuppressWarnings("unchecked")
             public X get() throws InterruptedException, ExecutionException {
                return (X) retval;
             }
-
-            public X get(long timeout, TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException {
-               return get();
-            }
-
-            public NotifyingFuture<X> attachListener(FutureListener<X> futureListener) {
-               futureListener.futureDone(this);
-               return this;
-            }
          };
       }
    }

Added: trunk/core/src/main/java/org/infinispan/util/concurrent/AbstractInProcessFuture.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/util/concurrent/AbstractInProcessFuture.java	                        (rev 0)
+++ trunk/core/src/main/java/org/infinispan/util/concurrent/AbstractInProcessFuture.java	2010-05-11 10:47:56 UTC (rev 1771)
@@ -0,0 +1,31 @@
+package org.infinispan.util.concurrent;
+
+import java.util.concurrent.*;
+
+/**
+ * An abstract Future that has "completed"
+ *
+ * @author Manik Surtani
+ * @version 4.1
+ */
+public abstract class AbstractInProcessFuture<V> implements Future<V> {
+   @Override
+   public boolean cancel(boolean mayInterruptIfRunning) {
+      return false;
+   }
+
+   @Override
+   public boolean isCancelled() {
+      return false;
+   }
+
+   @Override
+   public boolean isDone() {
+      return true;
+   }
+
+   @Override
+   public V get(long timeout, TimeUnit unit) throws InterruptedException, ExecutionException, java.util.concurrent.TimeoutException {
+      return get();
+   }
+}


Property changes on: trunk/core/src/main/java/org/infinispan/util/concurrent/AbstractInProcessFuture.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: trunk/core/src/main/java/org/infinispan/util/concurrent/AbstractInProcessNotifyingFuture.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/util/concurrent/AbstractInProcessNotifyingFuture.java	                        (rev 0)
+++ trunk/core/src/main/java/org/infinispan/util/concurrent/AbstractInProcessNotifyingFuture.java	2010-05-11 10:47:56 UTC (rev 1771)
@@ -0,0 +1,16 @@
+package org.infinispan.util.concurrent;
+
+import java.util.concurrent.ExecutionException;
+
+/**
+ * An abstract NotifyingFuture that has "completed"
+ *
+ * @author Manik Surtani
+ * @version 4.1
+ */
+public abstract class AbstractInProcessNotifyingFuture<V> extends AbstractInProcessFuture<V> implements NotifyingFuture<V> {
+   public NotifyingFuture<V> attachListener(FutureListener<V> futureListener) {
+      futureListener.futureDone(this);
+      return this;
+   }
+}


Property changes on: trunk/core/src/main/java/org/infinispan/util/concurrent/AbstractInProcessNotifyingFuture.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF