[gentoo-commits] gentoo-x86 commit in dev-java/jmock/files: 2.5.1-invokeAll-invokeAny.patch

[Johann Schmitz (ercpe)]

ercpe       14/02/28 17:39:23

  Added:                2.5.1-invokeAll-invokeAny.patch
  Log:
  Version bump of jmock wrt bug #213175
  
  (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 77C501ED)

Revision  Changes    Path
1.1                  dev-java/jmock/files/2.5.1-invokeAll-invokeAny.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jmock/files/2.5.1-invokeAll-invokeAny.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jmock/files/2.5.1-invokeAll-invokeAny.patch?rev=1.1&content-type=text/plain

Index: 2.5.1-invokeAll-invokeAny.patch
===================================================================
diff --git a/jmock-2.5.1/src/org/jmock/lib/concurrent/DeterministicScheduler.java b/jmock-2.5.1/src/org/jmock/lib/concurrent/DeterministicScheduler.java
index 6dbc020..0dce41c 100644
--- a/jmock-2.5.1/src/org/jmock/lib/concurrent/DeterministicScheduler.java
+++ b/jmock-2.5.1/src/org/jmock/lib/concurrent/DeterministicScheduler.java
@@ -110,21 +110,21 @@ public class DeterministicScheduler implements ScheduledExecutorService {
         throw blockingOperationsNotSupported();
     }
 
-    public <T> List<Future<T>> invokeAll(Collection<Callable<T>> tasks) throws InterruptedException {
+    public <T> List<Future<T>> invokeAll(Collection<? extends Callable<T>> tasks) throws InterruptedException {
         throw blockingOperationsNotSupported();
     }
 
-    public <T> List<Future<T>> invokeAll(Collection<Callable<T>> tasks, long timeout, TimeUnit unit) throws InterruptedException {
+    public <T> List<Future<T>> invokeAll(Collection<? extends Callable<T>> tasks, long timeout, TimeUnit unit) throws InterruptedException {
         throw blockingOperationsNotSupported();
     }
     
-    public <T> T invokeAny(Collection<Callable<T>> tasks)
+    public <T> T invokeAny(Collection<? extends Callable<T>> tasks)
         throws InterruptedException, ExecutionException 
     {
         throw blockingOperationsNotSupported();
     }
 
-    public <T> T invokeAny(Collection<Callable<T>> tasks, long timeout, TimeUnit unit) 
+    public <T> T invokeAny(Collection<? extends Callable<T>> tasks, long timeout, TimeUnit unit) 
         throws InterruptedException, ExecutionException, TimeoutException 
     {
         throw blockingOperationsNotSupported();