[Swift-commit] cog r3424

[swift at ci.uchicago.edu]

------------------------------------------------------------------------
r3424 | hategan | 2012-07-02 11:29:36 -0500 (Mon, 02 Jul 2012) | 1 line

fixed deadlock when shutting down coaster service (bug 795)
------------------------------------------------------------------------
Index: modules/provider-coaster/src/org/globus/cog/abstraction/coaster/service/job/manager/BlockQueueProcessor.java
===================================================================
--- modules/provider-coaster/src/org/globus/cog/abstraction/coaster/service/job/manager/BlockQueueProcessor.java	(revision 3423)
+++ modules/provider-coaster/src/org/globus/cog/abstraction/coaster/service/job/manager/BlockQueueProcessor.java	(working copy)
@@ -789,11 +789,13 @@
 
     private void shutdownBlocks() {
         logger.info("Shutting down blocks");
+        List<Block> bl;
         synchronized (blocks) {
-            for (Block b : new ArrayList<Block>(blocks.values())) {
-                b.shutdown(true);
-            }
+            bl = new ArrayList<Block>(blocks.values());
         }
+        for (Block b : bl) {
+            b.shutdown(true);
+        }
     }
 
     public void blockTaskFinished(Block block) {