svn commit: r1462731 - /incubator/onami/trunk/lifecycle/warmup/src/main/java/org/apache/onami/lifecycle/warmup/WarmUper.java

[ash2k]

Author: ash2k
Date: Sat Mar 30 11:10:32 2013
New Revision: 1462731

URL: http://svn.apache.org/r1462731
Log:
[ONAMI-103] Ensure that ForkJoinPool is always shutdown

Modified:
    
incubator/onami/trunk/lifecycle/warmup/src/main/java/org/apache/onami/lifecycle/warmup/WarmUper.java

Modified: 
incubator/onami/trunk/lifecycle/warmup/src/main/java/org/apache/onami/lifecycle/warmup/WarmUper.java
URL: 
http://svn.apache.org/viewvc/incubator/onami/trunk/lifecycle/warmup/src/main/java/org/apache/onami/lifecycle/warmup/WarmUper.java?rev=1462731&r1=1462730&r2=1462731&view=diff
==============================================================================
--- 
incubator/onami/trunk/lifecycle/warmup/src/main/java/org/apache/onami/lifecycle/warmup/WarmUper.java
 (original)
+++ 
incubator/onami/trunk/lifecycle/warmup/src/main/java/org/apache/onami/lifecycle/warmup/WarmUper.java
 Sat Mar 30 11:10:32 2013
@@ -116,10 +116,15 @@ public class WarmUper<A extends Annotati
         reverseLookup.clear();
 
         ForkJoinPool forkJoinPool = new ForkJoinPool();
-        ConcurrentMap<TypeLiteral<?>, WarmUpTask> inProgress = new 
ConcurrentHashMap<TypeLiteral<?>, WarmUpTask>();
-        forkJoinPool.submit( new WarmUpTask( stageHandler, WarmUpTask.ROOT, 
localCopy, inProgress ) );
-        forkJoinPool.shutdown();
-
+        try
+        {
+            ConcurrentMap<TypeLiteral<?>, WarmUpTask> inProgress = new 
ConcurrentHashMap<TypeLiteral<?>, WarmUpTask>();
+            forkJoinPool.submit( new WarmUpTask( stageHandler, 
WarmUpTask.ROOT, localCopy, inProgress ) );
+        }
+        finally
+        {
+            forkJoinPool.shutdown();
+        }
         try
         {
             boolean success = forkJoinPool.awaitTermination( maxMs, 
TimeUnit.MILLISECONDS );