summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Ardill <andrew.ardill@gmail.com>2011-02-21 12:30:45 +1100
committerAndrew Ardill <andrew.ardill@gmail.com>2011-02-21 16:32:41 +1100
commit30d1a5d3fd4f5a6d682646f4ee2e790433884c6a (patch)
tree62abf25ac0bd358d9c236089794fc395726d0d2a
parent6269c1e633d6736cacc75c0a55f56fbf182fea88 (diff)
downloadcraftbukkit-30d1a5d3fd4f5a6d682646f4ee2e790433884c6a.tar
craftbukkit-30d1a5d3fd4f5a6d682646f4ee2e790433884c6a.tar.gz
craftbukkit-30d1a5d3fd4f5a6d682646f4ee2e790433884c6a.tar.lz
craftbukkit-30d1a5d3fd4f5a6d682646f4ee2e790433884c6a.tar.xz
craftbukkit-30d1a5d3fd4f5a6d682646f4ee2e790433884c6a.zip
returning if a thread is not alive should happen before any changes to
the list of workers, hence the return statement should be in the synchronized block.
-rw-r--r--src/main/java/org/bukkit/craftbukkit/scheduler/CraftThreadManager.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftThreadManager.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftThreadManager.java
index d63b458e..29defcda 100644
--- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftThreadManager.java
+++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftThreadManager.java
@@ -61,8 +61,8 @@ public class CraftThreadManager {
return craftWorker.isAlive();
}
}
+ // didn't find it, so it must have been removed
+ return false;
}
- // didn't find it, so it must have been removed
- return false;
}
}