You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2014/01/15 16:17:41 UTC
svn commit: r1558419 - in /felix/trunk/coordinator/src:
main/java/org/apache/felix/coordinator/impl/CoordinationMgr.java
test/java/org/apache/felix/coordinator/impl/CoordinatorImplTest.java
Author: cziegeler
Date: Wed Jan 15 15:17:40 2014
New Revision: 1558419
URL: http://svn.apache.org/r1558419
Log:
Fix timeout check
Modified:
felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinationMgr.java
felix/trunk/coordinator/src/test/java/org/apache/felix/coordinator/impl/CoordinatorImplTest.java
Modified: felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinationMgr.java
URL: http://svn.apache.org/viewvc/felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinationMgr.java?rev=1558419&r1=1558418&r2=1558419&view=diff
==============================================================================
--- felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinationMgr.java (original)
+++ felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinationMgr.java Wed Jan 15 15:17:40 2014
@@ -164,7 +164,7 @@ public class CoordinationMgr
}
// 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);
Modified: felix/trunk/coordinator/src/test/java/org/apache/felix/coordinator/impl/CoordinatorImplTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/coordinator/src/test/java/org/apache/felix/coordinator/impl/CoordinatorImplTest.java?rev=1558419&r1=1558418&r2=1558419&view=diff
==============================================================================
--- felix/trunk/coordinator/src/test/java/org/apache/felix/coordinator/impl/CoordinatorImplTest.java (original)
+++ felix/trunk/coordinator/src/test/java/org/apache/felix/coordinator/impl/CoordinatorImplTest.java Wed Jan 15 15:17:40 2014
@@ -366,7 +366,7 @@ public class CoordinatorImplTest extends
{
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());
}
}