You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2016/12/15 14:37:32 UTC
svn commit: r1774478 -
/sling/trunk/testing/junit/core/src/main/java/org/apache/sling/junit/rules/ServerSideTeleporter.java
Author: sseifert
Date: Thu Dec 15 14:37:32 2016
New Revision: 1774478
URL: http://svn.apache.org/viewvc?rev=1774478&view=rev
Log:
SLING-6400 Server-Side Tests: Timeout-handling broken
Modified:
sling/trunk/testing/junit/core/src/main/java/org/apache/sling/junit/rules/ServerSideTeleporter.java
Modified: sling/trunk/testing/junit/core/src/main/java/org/apache/sling/junit/rules/ServerSideTeleporter.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/junit/core/src/main/java/org/apache/sling/junit/rules/ServerSideTeleporter.java?rev=1774478&r1=1774477&r2=1774478&view=diff
==============================================================================
--- sling/trunk/testing/junit/core/src/main/java/org/apache/sling/junit/rules/ServerSideTeleporter.java (original)
+++ sling/trunk/testing/junit/core/src/main/java/org/apache/sling/junit/rules/ServerSideTeleporter.java Thu Dec 15 14:37:32 2016
@@ -67,7 +67,7 @@ class ServerSideTeleporter extends Telep
if (configuredTimeout == null) {
configuredTimeout = Integer.toString(WAITFOR_SERVICE_TIMEOUT_DEFAULT_SECONDS);
}
- final long timeout = System.currentTimeMillis() + Integer.parseInt(configuredTimeout) * 1000;
+ final long timeout = Integer.parseInt(configuredTimeout) * 1000;
try {
T service = getServiceInternal(serviceClass, ldapFilter, timeout);
if (service != null) {