[Smartfrog-checkins] SF.net SVN: smartfrog:[7316] trunk/core/smartfrog/src/org/smartfrog/ services/assertions/TestCompoundImpl.java

[<st...@us...>]

Revision: 7316
          http://smartfrog.svn.sourceforge.net/smartfrog/?rev=7316&view=rev
Author:   steve_l
Date:     2009-01-28 12:34:01 +0000 (Wed, 28 Jan 2009)

Log Message:
-----------
SFOS-1086 Possible deadlock in DelayedTerminator.
 -making more of TestCompoundImpl's termination unsynchronized

Modified Paths:
--------------
    trunk/core/smartfrog/src/org/smartfrog/services/assertions/TestCompoundImpl.java

Modified: trunk/core/smartfrog/src/org/smartfrog/services/assertions/TestCompoundImpl.java
===================================================================
--- trunk/core/smartfrog/src/org/smartfrog/services/assertions/TestCompoundImpl.java	2009-01-28 12:30:38 UTC (rev 7315)
+++ trunk/core/smartfrog/src/org/smartfrog/services/assertions/TestCompoundImpl.java	2009-01-28 12:34:01 UTC (rev 7316)
@@ -447,11 +447,19 @@
      * @param record exit status
      */
     @Override
-    public synchronized void sfTerminateWith(TerminationRecord record) {
+    public void sfTerminateWith(TerminationRecord record) {
         sendEvent(new TerminatedEvent(this, record));
         super.sfTerminateWith(record);
-        shutdown(actionTerminator);
-        shutdown(testsTerminator);
+        try {
+            shutdown(actionTerminator);
+        } finally {
+            actionTerminator = null;
+        }
+        try {
+            shutdown(testsTerminator);
+        } finally {
+            testsTerminator = null;
+        }
     }
 
     /**


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.