felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r1693698 - in /felix/trunk/coordinator/src: main/java/org/apache/felix/coordinator/impl/CoordinationImpl.java test/java/org/apache/felix/coordinator/impl/CoordinatorImplTest.java
Date Sat, 01 Aug 2015 09:46:21 GMT
Author: cziegeler
Date: Sat Aug  1 09:46:21 2015
New Revision: 1693698

URL: http://svn.apache.org/r1693698
Log:
Revert accidental commit

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

Modified: felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinationImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinationImpl.java?rev=1693698&r1=1693697&r2=1693698&view=diff
==============================================================================
--- felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinationImpl.java
(original)
+++ felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinationImpl.java
Sat Aug  1 09:46:21 2015
@@ -58,7 +58,7 @@ public class CoordinationImpl implements
 
     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 @@ public class CoordinationImpl implements
      */
     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 @@ public class CoordinationImpl implements
 		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() {

Modified: felix/trunk/coordinator/src/test/java/org/apache/felix/coordinator/impl/CoordinatorImplTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/coordinator/src/test/java/org/apache/felix/coordinator/impl/CoordinatorImplTest.java?rev=1693698&r1=1693697&r2=1693698&view=diff
==============================================================================
--- felix/trunk/coordinator/src/test/java/org/apache/felix/coordinator/impl/CoordinatorImplTest.java
(original)
+++ felix/trunk/coordinator/src/test/java/org/apache/felix/coordinator/impl/CoordinatorImplTest.java
Sat Aug  1 09:46:21 2015
@@ -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 @@ public class CoordinatorImplTest extends
 
     /**
      * Regression test for FELIX-4976
-     */
     public void test_coordinationOrphanedBug()
     {
         coordinator.begin("test", 0);
         System.gc();
         coordinator.pop().end();
     }
+     */
 
     public void test_beginCoordination_stack()
     {



Mime
View raw message