From 71b663913246c634e7381c48d62c850570704368 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 03 Sep 2015 08:43:41 +0000
Subject: [PATCH] TestTimer.java: do not decrement counter twice in presence of AssertionError
---
opendj-server-legacy/src/test/java/org/opends/server/util/TestTimer.java | 12 ++----------
1 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/util/TestTimer.java b/opendj-server-legacy/src/test/java/org/opends/server/util/TestTimer.java
index 19ccb7b..56289d3 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/util/TestTimer.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/util/TestTimer.java
@@ -125,7 +125,6 @@
private final long sleepTime;
private final long totalNbSteps;
private long nbStepsRemaining;
- private boolean started;
private SteppingTimer(Builder builder)
{
@@ -134,12 +133,6 @@
this.nbStepsRemaining = totalNbSteps;
}
- private SteppingTimer startTimer()
- {
- started = true;
- return this;
- }
-
/**
* Returns whether the timer has reached the timeout. This method may block by sleeping.
*
@@ -152,6 +145,7 @@
if (!done)
{
Thread.sleep(sleepTime);
+ nbStepsRemaining--;
}
return done;
}
@@ -163,14 +157,12 @@
*/
private boolean hasTimedOutNoSleep()
{
- Reject.ifTrue(!started, "start() method should have been called first");
- return nbStepsRemaining-- <= 0;
+ return nbStepsRemaining <= 0;
}
@Override
public <R> R repeatUntilSuccess(Callable<R> callable) throws Exception, InterruptedException
{
- startTimer();
do
{
try
--
Gitblit v1.10.0