svn commit: r1025761 - /felix/trunk/coordinator/src/main/java/org/apache/felix/coordination/impl/CoordinationImpl.java

[fm...@apache.org]

Author: fmeschbe
Date: Wed Oct 20 21:19:57 2010
New Revision: 1025761

URL: http://svn.apache.org/viewvc?rev=1025761&view=rev
Log:
FELIX-2671 (OSGi Bug 97) On timeout the Coordination is immediately
terminated without interrupting the Coordination thread and waiting
for it to terminate nicely.

Modified:
    felix/trunk/coordinator/src/main/java/org/apache/felix/coordination/impl/CoordinationImpl.java

Modified: felix/trunk/coordinator/src/main/java/org/apache/felix/coordination/impl/CoordinationImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/coordinator/src/main/java/org/apache/felix/coordination/impl/CoordinationImpl.java?rev=1025761&r1=1025760&r2=1025761&view=diff
==============================================================================
--- felix/trunk/coordinator/src/main/java/org/apache/felix/coordination/impl/CoordinationImpl.java (original)
+++ felix/trunk/coordinator/src/main/java/org/apache/felix/coordination/impl/CoordinationImpl.java Wed Oct 20 21:19:57 2010
@@ -113,19 +113,7 @@ public class CoordinationImpl implements
         // If a timeout happens, the coordination thread is set to always fail
         this.mustFail = TIMEOUT;
 
-        // and interrupted and a small delay happens to allow the initiator to
-        // clean up by reacting on the interrupt. If the initiator can do this
-        // clean up normally, the end() method will return TIMEOUT.
-        try {
-            initiatorThread.interrupt();
-            Thread.sleep(500); // half a second for now
-        } catch (SecurityException se) {
-            // thrown by interrupt -- no need to wait if interrupt fails
-        } catch (InterruptedException ie) {
-            // someone interrupted us while delaying, just continue
-        }
-
-        // After this delay the coordination is forcefully failed.
+        // Faile the Coordination upon timeout
         CoordinationImpl.this.fail(null);
     }