From 693e1dee4cf46159c6c1e255e40a346985db4115 Mon Sep 17 00:00:00 2001
From: stack <stack@apache.org>
Date: Sat, 5 Dec 2015 14:29:12 -0800
Subject: [PATCH] Revert "HBASE-1422 Delayed flush doesn't work causing flush
 storms; addendum by Lars Hofhansl" Pushed with wrong JIRA number. Revert to
 fix.

This reverts commit 7d0c08fbcdb6ab84bc8fb78fdc840c7b29720390.
---
 .../hadoop/hbase/JitterScheduledThreadPoolExecutorImpl.java    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/JitterScheduledThreadPoolExecutorImpl.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/JitterScheduledThreadPoolExecutorImpl.java
index 7e7239e6805..ca152860e18 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/JitterScheduledThreadPoolExecutorImpl.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/JitterScheduledThreadPoolExecutorImpl.java
@@ -81,8 +81,7 @@ public class JitterScheduledThreadPoolExecutorImpl extends ScheduledThreadPoolEx
     public long getDelay(TimeUnit unit) {
       long baseDelay = wrapped.getDelay(unit);
       long spreadTime = (long) (baseDelay * spread);
-      long delay = spreadTime <= 0 ? baseDelay
-          : baseDelay + ThreadLocalRandom.current().nextLong(-spreadTime, spreadTime);
+      long delay = baseDelay + ThreadLocalRandom.current().nextLong(-spreadTime, spreadTime);
       // Ensure that we don't roll over for nanoseconds.
       return (delay < 0) ? baseDelay : delay;
     }