You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by pd...@apache.org on 2012/10/03 00:01:33 UTC
svn commit: r1393207 -
/felix/trunk/scr/src/test/java/org/apache/felix/scr/integration/components/felix3680/Main.java
Author: pderop
Date: Tue Oct 2 22:01:33 2012
New Revision: 1393207
URL: http://svn.apache.org/viewvc?rev=1393207&view=rev
Log:
return from the run method instead of exiting, when a latch can't be acquired timely.
Modified:
felix/trunk/scr/src/test/java/org/apache/felix/scr/integration/components/felix3680/Main.java
Modified: felix/trunk/scr/src/test/java/org/apache/felix/scr/integration/components/felix3680/Main.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr/src/test/java/org/apache/felix/scr/integration/components/felix3680/Main.java?rev=1393207&r1=1393206&r2=1393207&view=diff
==============================================================================
--- felix/trunk/scr/src/test/java/org/apache/felix/scr/integration/components/felix3680/Main.java (original)
+++ felix/trunk/scr/src/test/java/org/apache/felix/scr/integration/components/felix3680/Main.java Tue Oct 2 22:01:33 2012
@@ -189,7 +189,7 @@ public class Main implements Runnable
System.out.println("Did not get A injected timely ... see logs.txt");
_logService.log(LogService.LOG_ERROR, "enableLatch TIMEOUT");
dumpComponents();
- System.exit(1);
+ return;
}
}
catch (InterruptedException e)
@@ -204,7 +204,7 @@ public class Main implements Runnable
System.out.println("Could not disable components timely ... see logs.txt");
_logService.log(LogService.LOG_ERROR, "disableLatch TIMEOUT");
dumpComponents();
- System.exit(1);
+ return;
}
}
catch (InterruptedException e)