commit bf33586a3f639fe5c3551a889cbec870c846b2e0
author Pierre De Rop <pderop@apache.org> Tue Oct 02 22:01:33 2012 +0000
committer Pierre De Rop <pderop@apache.org> Tue Oct 02 22:01:33 2012 +0000
tree 97f523f7fb034431814f2eb5f00388d6898bb89a
parent 09f42173c3b4881d13493f2a71f8e62f47d1e727

return from the run method instead of exiting, when a latch can't be acquired timely.


git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1393207 13f79535-47bb-0310-9956-ffa450edef68

scr/src/test/java/org/apache/felix/scr/integration/components/felix3680/Main.java

diff --git a/scr/src/test/java/org/apache/felix/scr/integration/components/felix3680/Main.java b/scr/src/test/java/org/apache/felix/scr/integration/components/felix3680/Main.java
index 7429ebb..64c2ec9 100644
--- a/scr/src/test/java/org/apache/felix/scr/integration/components/felix3680/Main.java
+++ b/scr/src/test/java/org/apache/felix/scr/integration/components/felix3680/Main.java
@@ -189,7 +189,7 @@
                     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 @@
                     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)