[jboss-svn-commits] JBL Code SVN: r23248 - in labs/jbosstm/workspace/adinn/orchestration: src/org/jboss/jbossts/orchestration/rule and 1 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: adinn
Date: 2008-10-01 12:53:51 -0400 (Wed, 01 Oct 2008)
New Revision: 23248

Modified:
   labs/jbosstm/workspace/adinn/orchestration/docs/ProgrammersGuide.odt
   labs/jbosstm/workspace/adinn/orchestration/docs/ProgrammersGuide.pdf
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/Rule.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/synchronization/Waiter.java
Log:
patched errors in wait/signal code including renaming signal method to signalWake to avoid conflicts with Object.signal

Modified: labs/jbosstm/workspace/adinn/orchestration/docs/ProgrammersGuide.odt
===================================================================
(Binary files differ)

Modified: labs/jbosstm/workspace/adinn/orchestration/docs/ProgrammersGuide.pdf
===================================================================
(Binary files differ)

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/Rule.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/Rule.java	2008-10-01 16:01:03 UTC (rev 23247)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/Rule.java	2008-10-01 16:53:51 UTC (rev 23248)
@@ -745,12 +745,12 @@
          * this argument is used as a key to identify a synchronization object private to the rule
          * system.
          */
-        public boolean signal(Object identifier)
+        public boolean signalWake(Object identifier)
         {
             Waiter waiter = removeWaiter(identifier);
 
             if (waiter != null) {
-                return waiter.signal();
+                return waiter.signalWake();
             }
             
             return false;

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/synchronization/Waiter.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/synchronization/Waiter.java	2008-10-01 16:01:03 UTC (rev 23247)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/synchronization/Waiter.java	2008-10-01 16:53:51 UTC (rev 23248)
@@ -56,7 +56,7 @@
         }
     }
 
-    public boolean signal()
+    public boolean signalWake()
     {
         boolean result;
 
@@ -64,11 +64,9 @@
             result = signalled;
             if (!signalled) {
                 signalled = true;
+                this.notifyAll();
             }
         }
-        if (!result) {
-            this.notifyAll();
-        }
 
         return result;
     }
@@ -82,13 +80,10 @@
             if (!signalled) {
                 signalled = true;
                 killed = true;
+                this.notifyAll();
             }
         }
 
-        if (!result) {
-            this.notifyAll();
-        }
-
         return result;
     }