You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by sy...@apache.org on 2015/12/17 00:45:15 UTC

[04/12] hbase git commit: HBASE-14977 ChoreService.shutdown may result in ConcurrentModificationException (Vladimir Rodionov)

HBASE-14977 ChoreService.shutdown may result in ConcurrentModificationException (Vladimir Rodionov)


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/a4bbc461
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/a4bbc461
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/a4bbc461

Branch: refs/heads/hbase-12439
Commit: a4bbc461e367994ed7b41673a4accb99bbe5c364
Parents: abe30b5
Author: Enis Soztutar <en...@apache.org>
Authored: Tue Dec 15 11:57:28 2015 -0800
Committer: Enis Soztutar <en...@apache.org>
Committed: Tue Dec 15 12:29:43 2015 -0800

----------------------------------------------------------------------
 .../src/main/java/org/apache/hadoop/hbase/ChoreService.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/a4bbc461/hbase-common/src/main/java/org/apache/hadoop/hbase/ChoreService.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/ChoreService.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/ChoreService.java
index 091d854..5c3d215 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/ChoreService.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/ChoreService.java
@@ -317,7 +317,7 @@ public class ChoreService implements ChoreServicer {
    * in the middle of execution will be interrupted and shutdown. This service will be unusable
    * after this method has been called (i.e. future scheduling attempts will fail).
    */
-  public void shutdown() {
+  public synchronized void shutdown() {
     scheduler.shutdownNow();
     if (LOG.isInfoEnabled()) {
       LOG.info("Chore service for: " + coreThreadPoolPrefix + " had " + scheduledChores.keySet()