| commit | d22cf92224ba9a4542f1219c7ee3d97170ae8d3d | [log] [tgz] |
|---|---|---|
| author | Carsten Ziegeler <cziegeler@apache.org> | Wed Jan 15 15:17:40 2014 +0000 |
| committer | Carsten Ziegeler <cziegeler@apache.org> | Wed Jan 15 15:17:40 2014 +0000 |
| tree | 789662dd02eacf019c4a734d6ef535d50181062f | |
| parent | 3a8f9454db51fd82352e38d211f4c0538549230b [diff] |
Fix timeout check git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1558419 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinationMgr.java b/coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinationMgr.java index f4e512a..6c85c26 100644 --- a/coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinationMgr.java +++ b/coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinationMgr.java
@@ -164,7 +164,7 @@ } // timeout waiting for participation - if (System.currentTimeMillis() > cutOff) + if (System.currentTimeMillis() >= cutOff) { throw new CoordinationException("Timed out waiting to join coordinaton", c, CoordinationException.FAILED, Coordination.TIMEOUT);
diff --git a/coordinator/src/test/java/org/apache/felix/coordinator/impl/CoordinatorImplTest.java b/coordinator/src/test/java/org/apache/felix/coordinator/impl/CoordinatorImplTest.java index ecd94da..4c30658 100644 --- a/coordinator/src/test/java/org/apache/felix/coordinator/impl/CoordinatorImplTest.java +++ b/coordinator/src/test/java/org/apache/felix/coordinator/impl/CoordinatorImplTest.java
@@ -366,7 +366,7 @@ { c2Thread.interrupt(); c2Thread.join(1000); - assertFalse("Thread for second Coordination did not terminate....", c2Thread.isAlive()); + assertFalse("Thread for second Coordination did still not terminate....", c2Thread.isAlive()); } }