Revert accidental commit
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1693698 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinationImpl.java b/coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinationImpl.java
index 587dd11..152b422 100644
--- a/coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinationImpl.java
+++ b/coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinationImpl.java
@@ -58,7 +58,7 @@
private final String name;
- private volatile long deadLine;
+ private long deadLine;
/**
* Access to this field must be synchronized as long as the expected state
@@ -68,17 +68,15 @@
*/
private volatile State state;
- private volatile Throwable failReason;
+ private Throwable failReason;
private final ArrayList<Participant> participants;
private final Map<Class<?>, Object> variables;
- private volatile TimerTask timeoutTask;
+ private TimerTask timeoutTask;
- private volatile Thread associatedThread;
-
- private volatile CoordinationHolder threadAssociatedRef;
+ private Thread associatedThread;
private final Object waitLock = new Object();
@@ -539,17 +537,8 @@
return id == other.id;
}
- void setAssociatedThread(final Thread t)
- {
+ void setAssociatedThread(final Thread t) {
this.associatedThread = t;
- if ( t != null )
- {
- this.threadAssociatedRef = this.holderRef.get();
- }
- else
- {
- this.threadAssociatedRef = null;
- }
}
public Coordination getHolder() {
diff --git a/coordinator/src/test/java/org/apache/felix/coordinator/impl/CoordinatorImplTest.java b/coordinator/src/test/java/org/apache/felix/coordinator/impl/CoordinatorImplTest.java
index 540d947..e976d2c 100644
--- a/coordinator/src/test/java/org/apache/felix/coordinator/impl/CoordinatorImplTest.java
+++ b/coordinator/src/test/java/org/apache/felix/coordinator/impl/CoordinatorImplTest.java
@@ -18,12 +18,12 @@
*/
package org.apache.felix.coordinator.impl;
-import junit.framework.TestCase;
-
import org.osgi.service.coordinator.Coordination;
import org.osgi.service.coordinator.CoordinationException;
import org.osgi.service.coordinator.Participant;
+import junit.framework.TestCase;
+
public class CoordinatorImplTest extends TestCase
{
@@ -128,13 +128,13 @@
/**
* Regression test for FELIX-4976
- */
public void test_coordinationOrphanedBug()
{
coordinator.begin("test", 0);
System.gc();
coordinator.pop().end();
}
+ */
public void test_beginCoordination_stack()
{