From b81315077ccecf60629092af168d40ce0df09095 Mon Sep 17 00:00:00 2001 From: Karthik Kambatla Date: Sun, 29 Dec 2013 05:44:41 +0000 Subject: [PATCH] YARN-1481. Reverting addendum patch git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1553995 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/hadoop/yarn/server/resourcemanager/AdminService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/AdminService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/AdminService.java index 10e73267680..33230d86f9b 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/AdminService.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/AdminService.java @@ -174,7 +174,7 @@ public class AdminService extends AbstractService implements } } - private boolean isRMActive() { + private synchronized boolean isRMActive() { return HAServiceState.ACTIVE == rmContext.getHAServiceState(); }