This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-lang.git
The following commit(s) were added to refs/heads/master by this push: new 5755cce Use the scale in names. 5755cce is described below commit 5755cced016dd176508a8f1a9c35bfc863bc8cf9 Author: Gary Gregory <garydgreg...@gmail.com> AuthorDate: Tue Feb 2 18:02:26 2021 -0500 Use the scale in names. --- .../commons/lang3/concurrent/EventCountCircuitBreaker.java | 10 +++++----- .../commons/lang3/concurrent/EventCountCircuitBreakerTest.java | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/apache/commons/lang3/concurrent/EventCountCircuitBreaker.java b/src/main/java/org/apache/commons/lang3/concurrent/EventCountCircuitBreaker.java index f924ece..2d44a12 100644 --- a/src/main/java/org/apache/commons/lang3/concurrent/EventCountCircuitBreaker.java +++ b/src/main/java/org/apache/commons/lang3/concurrent/EventCountCircuitBreaker.java @@ -293,7 +293,7 @@ public class EventCountCircuitBreaker extends AbstractCircuitBreaker<Integer> { @Override public void open() { super.open(); - checkIntervalData.set(new CheckIntervalData(0, now())); + checkIntervalData.set(new CheckIntervalData(0, nanoTime())); } /** @@ -305,7 +305,7 @@ public class EventCountCircuitBreaker extends AbstractCircuitBreaker<Integer> { @Override public void close() { super.close(); - checkIntervalData.set(new CheckIntervalData(0, now())); + checkIntervalData.set(new CheckIntervalData(0, nanoTime())); } /** @@ -321,7 +321,7 @@ public class EventCountCircuitBreaker extends AbstractCircuitBreaker<Integer> { State currentState; do { - final long time = now(); + final long time = nanoTime(); currentState = state.get(); currentData = checkIntervalData.get(); nextData = nextCheckIntervalData(increment, currentData, currentState, time); @@ -360,7 +360,7 @@ public class EventCountCircuitBreaker extends AbstractCircuitBreaker<Integer> { */ private void changeStateAndStartNewCheckInterval(final State newState) { changeState(newState); - checkIntervalData.set(new CheckIntervalData(0, now())); + checkIntervalData.set(new CheckIntervalData(0, nanoTime())); } /** @@ -391,7 +391,7 @@ public class EventCountCircuitBreaker extends AbstractCircuitBreaker<Integer> { * * @return the current time in nanoseconds */ - long now() { + long nanoTime() { return System.nanoTime(); } diff --git a/src/test/java/org/apache/commons/lang3/concurrent/EventCountCircuitBreakerTest.java b/src/test/java/org/apache/commons/lang3/concurrent/EventCountCircuitBreakerTest.java index 02a9290..1a3e2cf 100644 --- a/src/test/java/org/apache/commons/lang3/concurrent/EventCountCircuitBreakerTest.java +++ b/src/test/java/org/apache/commons/lang3/concurrent/EventCountCircuitBreakerTest.java @@ -96,7 +96,7 @@ public class EventCountCircuitBreakerTest { public void testNow() { final EventCountCircuitBreaker breaker = new EventCountCircuitBreaker(OPENING_THRESHOLD, 1, TimeUnit.SECONDS); - final long nowNanos = breaker.now(); + final long nowNanos = breaker.nanoTime(); final long deltaNanos = Math.abs(System.nanoTime() - nowNanos); assertTrue(deltaNanos < 100_000, String.format("Delta %,d ns to current time too large", deltaNanos)); } @@ -364,7 +364,7 @@ public class EventCountCircuitBreakerTest { * method. */ @Override - long now() { + long nanoTime() { return currentTime; } }