INTERNAL: return partial result if error or cancel occurred in getSom…

…e method of BulkGetFuture

src/main/java/net/spy/memcached/internal/BulkFuture.java

@@ -1,6 +1,5 @@
 package net.spy.memcached.internal;
 
-import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 
@@ -29,17 +28,16 @@ public interface BulkFuture<V> extends Future<V> {
   /**
    * Wait for the operation to complete and return results.
    *
-   * If operation could not complete within specified
-   * timeout, partial result is returned. Otherwise, the
-   * behavior is identical to {@link #get(long, TimeUnit)}
+   * If operation could not complete within specified timeout, error, cancellation occurred,
+   * partial result is returned.
+   * Otherwise, the behavior is identical to {@link #get(long, TimeUnit)}
    *
    * @param timeout the maximum time to wait
    * @param unit    the time unit of the timeout argument
    * @return the computed result
    * @throws InterruptedException if the current thread was interrupted while waiting
-   * @throws ExecutionException   if the computation threw an exception
    */
-  V getSome(long timeout, TimeUnit unit) throws InterruptedException, ExecutionException;
+  V getSome(long timeout, TimeUnit unit) throws InterruptedException;
 
 
   int getOpCount();

src/main/java/net/spy/memcached/internal/BulkGetFuture.java

@@ -84,12 +84,10 @@ public Map<String, T> get() throws InterruptedException, ExecutionException {
   }
 
   @Override
-  public Map<String, T> getSome(long duration, TimeUnit unit)
-          throws InterruptedException, ExecutionException {
-
+  public Map<String, T> getSome(long duration, TimeUnit unit) throws InterruptedException {
     try {
       return internalGet(duration, unit, false);
-    } catch (TimeoutException e) {
+    } catch (TimeoutException | ExecutionException e) {
       throw new AssertionError("Something went wrong...", e);
     }
   }
@@ -131,8 +129,8 @@ public int getOpCount() {
    * refactored code common to both get(long, TimeUnit) and getSome(long,
    * TimeUnit)
    */
-  private Map<String, T> internalGet(long to, TimeUnit unit, boolean throwOnTimeout)
-           throws InterruptedException, ExecutionException, TimeoutException {
+  private Map<String, T> internalGet(long to, TimeUnit unit, boolean throwException)
+          throws InterruptedException, ExecutionException, TimeoutException {
 
     long beforeAwait = System.currentTimeMillis();
     if (!latch.await(to, unit)) {
@@ -150,7 +148,7 @@ private Map<String, T> internalGet(long to, TimeUnit unit, boolean throwOnTimeou
 
         long elapsed = System.currentTimeMillis() - beforeAwait;
         TimeoutException e = new CheckedOperationTimeoutException(to, unit, elapsed, timedOutOps);
-        if (throwOnTimeout) {
+        if (throwException) {
           throw e;
         }
         LoggerFactory.getLogger(getClass()).warn(e.getMessage());
@@ -177,6 +175,7 @@ private Map<String, T> internalGet(long to, TimeUnit unit, boolean throwOnTimeou
     }
     return resultMap;
   }
+
   /*
    * set to true if timeout was reached.
    *

src/main/java/net/spy/memcached/plugin/FrontCacheBulkGetFuture.java

@@ -50,8 +50,7 @@ public Map<String, T> get(long duration, TimeUnit unit)
   }
 
   @Override
-  public Map<String, T> getSome(long duration, TimeUnit unit)
-          throws InterruptedException, ExecutionException {
+  public Map<String, T> getSome(long duration, TimeUnit unit) throws InterruptedException {
     if (result != null) {
       return result;
     }