Return-Path: X-Original-To: apmail-hbase-commits-archive@www.apache.org Delivered-To: apmail-hbase-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id CCAB418F8A for ; Thu, 25 Feb 2016 00:34:32 +0000 (UTC) Received: (qmail 94609 invoked by uid 500); 25 Feb 2016 00:34:32 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 94569 invoked by uid 500); 25 Feb 2016 00:34:32 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 94560 invoked by uid 99); 25 Feb 2016 00:34:32 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 25 Feb 2016 00:34:32 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8EDD9E8EC9; Thu, 25 Feb 2016 00:34:32 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: eclark@apache.org To: commits@hbase.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: hbase git commit: HBASE-15319 clearJmxCache does not take effect actually Date: Thu, 25 Feb 2016 00:34:32 +0000 (UTC) Repository: hbase Updated Branches: refs/heads/master 630a65825 -> a3b4575f7 HBASE-15319 clearJmxCache does not take effect actually Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/a3b4575f Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/a3b4575f Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/a3b4575f Branch: refs/heads/master Commit: a3b4575f700c20167a6ab0b774d8a2c9cd3916af Parents: 630a658 Author: Elliott Clark Authored: Wed Feb 24 09:02:06 2016 -0800 Committer: Elliott Clark Committed: Wed Feb 24 16:29:05 2016 -0800 ---------------------------------------------------------------------- .../main/java/org/apache/hadoop/metrics2/impl/JmxCacheBuster.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/a3b4575f/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/metrics2/impl/JmxCacheBuster.java ---------------------------------------------------------------------- diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/metrics2/impl/JmxCacheBuster.java b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/metrics2/impl/JmxCacheBuster.java index 95734ba..8fcf623 100644 --- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/metrics2/impl/JmxCacheBuster.java +++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/metrics2/impl/JmxCacheBuster.java @@ -52,7 +52,7 @@ public class JmxCacheBuster { public static void clearJmxCache() { //If there are more then 100 ms before the executor will run then everything should be merged. ScheduledFuture future = fut.get(); - if ((future == null || (!future.isDone() && future.getDelay(TimeUnit.MILLISECONDS) > 100))) { + if ((future != null && (!future.isDone() && future.getDelay(TimeUnit.MILLISECONDS) > 100))) { // BAIL OUT return; }