You are viewing a plain text version of this content. The canonical link for it is here.
Posted to muse-commits@ws.apache.org by da...@apache.org on 2007/09/02 18:25:01 UTC

svn commit: r572017 - /webservices/muse/trunk/modules/muse-util/src/org/apache/muse/util/Timer.java

Author: danj
Date: Sun Sep  2 09:25:00 2007
New Revision: 572017

URL: http://svn.apache.org/viewvc?rev=572017&view=rev
Log:
Fix for MUSE-237 - making sure that cancelling a timer is idempotent

Modified:
    webservices/muse/trunk/modules/muse-util/src/org/apache/muse/util/Timer.java

Modified: webservices/muse/trunk/modules/muse-util/src/org/apache/muse/util/Timer.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-util/src/org/apache/muse/util/Timer.java?rev=572017&r1=572016&r2=572017&view=diff
==============================================================================
--- webservices/muse/trunk/modules/muse-util/src/org/apache/muse/util/Timer.java (original)
+++ webservices/muse/trunk/modules/muse-util/src/org/apache/muse/util/Timer.java Sun Sep  2 09:25:00 2007
@@ -52,7 +52,7 @@
     //
     // The enclosed timer - we use this for all the real work
     //
-    private java.util.Timer _timer = new java.util.Timer();
+    private java.util.Timer _timer = null;
     
     //
     // The time when this timer will execute its task
@@ -71,7 +71,12 @@
      */
     public final void cancel()
     {
-        _timer.cancel();
+        if (_timer != null)
+        {
+            _timer.cancel();
+            _timer = null;
+        }
+        
         _whenToFire = null;
     }
     
@@ -145,8 +150,6 @@
         // and make a new one
         //
         cancel();
-        _timer = new java.util.Timer();
-        
         schedule(task, whenToFire);
     }
     
@@ -174,7 +177,8 @@
         
         _task = task;
         _whenToFire = whenToFire;
-        
+
+        _timer = new java.util.Timer();
         _timer.schedule(_task, _whenToFire);
     }
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: muse-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: muse-commits-help@ws.apache.org