svn commit: r915417 - in /incubator/shiro/trunk/core/src/main/java/org/apache/shiro/concurrent: SubjectAwareExecutorService.java SubjectAwareScheduledExecutorService.java

[lh...@apache.org]

Author: lhazlewood
Date: Tue Feb 23 16:34:30 2010
New Revision: 915417

URL: http://svn.apache.org/viewvc?rev=915417&view=rev
Log:
SHIRO-140: Committing back the ExecutorService implementation of the 1.6 API (runtime erasure will work on JDK 1.5 - we are still 1.5 compatible) now that Hudson has been configured to build with 1.6

Modified:
    incubator/shiro/trunk/core/src/main/java/org/apache/shiro/concurrent/SubjectAwareExecutorService.java
    incubator/shiro/trunk/core/src/main/java/org/apache/shiro/concurrent/SubjectAwareScheduledExecutorService.java

Modified: incubator/shiro/trunk/core/src/main/java/org/apache/shiro/concurrent/SubjectAwareExecutorService.java
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/core/src/main/java/org/apache/shiro/concurrent/SubjectAwareExecutorService.java?rev=915417&r1=915416&r2=915417&view=diff
==============================================================================
--- incubator/shiro/trunk/core/src/main/java/org/apache/shiro/concurrent/SubjectAwareExecutorService.java (original)
+++ incubator/shiro/trunk/core/src/main/java/org/apache/shiro/concurrent/SubjectAwareExecutorService.java Tue Feb 23 16:34:30 2010
@@ -23,10 +23,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.*;
 
 /**
  * {@code ExecutorService} implementation that will automatically first associate any argument
@@ -59,7 +56,7 @@
  *
  * @since 1.0
  */
-public abstract class SubjectAwareExecutorService extends SubjectAwareExecutor implements ExecutorService {
+public class SubjectAwareExecutorService extends SubjectAwareExecutor implements ExecutorService {
 
     private ExecutorService targetExecutorService;
 
@@ -128,7 +125,7 @@
         return workItems;
     }
 
-    /*public <T> List<Future<T>> invokeAll(Collection<? extends Callable<T>> tasks) throws InterruptedException {
+    public <T> List<Future<T>> invokeAll(Collection<? extends Callable<T>> tasks) throws InterruptedException {
         Collection<Callable<T>> workItems = associateWithSubject(tasks);
         return this.targetExecutorService.invokeAll(workItems);
     }
@@ -148,5 +145,5 @@
             throws InterruptedException, ExecutionException, TimeoutException {
         Collection<Callable<T>> workItems = associateWithSubject(tasks);
         return this.targetExecutorService.invokeAny(workItems, timeout, unit);
-    }*/
+    }
 }

Modified: incubator/shiro/trunk/core/src/main/java/org/apache/shiro/concurrent/SubjectAwareScheduledExecutorService.java
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/core/src/main/java/org/apache/shiro/concurrent/SubjectAwareScheduledExecutorService.java?rev=915417&r1=915416&r2=915417&view=diff
==============================================================================
--- incubator/shiro/trunk/core/src/main/java/org/apache/shiro/concurrent/SubjectAwareScheduledExecutorService.java (original)
+++ incubator/shiro/trunk/core/src/main/java/org/apache/shiro/concurrent/SubjectAwareScheduledExecutorService.java Tue Feb 23 16:34:30 2010
@@ -27,7 +27,7 @@
  * Same concept as the {@link SubjectAwareExecutorService} but additionally supports the
  * {@link ScheduledExecutorService} interface.
  */
-public abstract class SubjectAwareScheduledExecutorService extends SubjectAwareExecutorService implements ScheduledExecutorService {
+public class SubjectAwareScheduledExecutorService extends SubjectAwareExecutorService implements ScheduledExecutorService {
 
     private ScheduledExecutorService targetScheduledExecutorService;