You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2010/02/22 03:39:21 UTC
svn commit: r912468 - in /geronimo/components/txmanager/trunk/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager: CommitTask.java ExponentialtIntervalRetryScheduler.java RecoverTask.java RetryScheduler.java

Author: djencks
Date: Mon Feb 22 02:39:21 2010
New Revision: 912468

URL: http://svn.apache.org/viewvc?rev=912468&view=rev
Log:
GERONIMO-5152 fix usage of timer tasks

Modified:
    geronimo/components/txmanager/trunk/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/CommitTask.java
    geronimo/components/txmanager/trunk/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/ExponentialtIntervalRetryScheduler.java
    geronimo/components/txmanager/trunk/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/RecoverTask.java
    geronimo/components/txmanager/trunk/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/RetryScheduler.java

Modified: geronimo/components/txmanager/trunk/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/CommitTask.java
URL: http://svn.apache.org/viewvc/geronimo/components/txmanager/trunk/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/CommitTask.java?rev=912468&r1=912467&r2=912468&view=diff
==============================================================================
--- geronimo/components/txmanager/trunk/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/CommitTask.java (original)
+++ geronimo/components/txmanager/trunk/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/CommitTask.java Mon Feb 22 02:39:21 2010
@@ -38,7 +38,7 @@
 /**
  * @version $Rev$ $Date$
  */
-public class CommitTask extends TimerTask {
+public class CommitTask implements Runnable {
     private static final Logger log = LoggerFactory.getLogger(CommitTask.class);
     private final Xid xid;
     private final List<TransactionBranch> rms;

Modified: geronimo/components/txmanager/trunk/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/ExponentialtIntervalRetryScheduler.java
URL: http://svn.apache.org/viewvc/geronimo/components/txmanager/trunk/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/ExponentialtIntervalRetryScheduler.java?rev=912468&r1=912467&r2=912468&view=diff
==============================================================================
--- geronimo/components/txmanager/trunk/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/ExponentialtIntervalRetryScheduler.java (original)
+++ geronimo/components/txmanager/trunk/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/ExponentialtIntervalRetryScheduler.java Mon Feb 22 02:39:21 2010
@@ -32,8 +32,22 @@
 
     private final int base = 2;
 
-    public void retry(TimerTask task, int count) {
+    public void retry(Runnable task, int count) {
         long interval = Math.round(Math.pow(base, count)) * 1000;
-        timer.schedule(task, interval);
+        timer.schedule(new TaskWrapper(task), interval);
+    }
+
+    private static class TaskWrapper extends TimerTask {
+
+        private final Runnable delegate;
+
+        private TaskWrapper(Runnable delegate) {
+            this.delegate = delegate;
+        }
+
+        @Override
+        public void run() {
+            delegate.run();
+        }
     }
 }

Modified: geronimo/components/txmanager/trunk/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/RecoverTask.java
URL: http://svn.apache.org/viewvc/geronimo/components/txmanager/trunk/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/RecoverTask.java?rev=912468&r1=912467&r2=912468&view=diff
==============================================================================
--- geronimo/components/txmanager/trunk/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/RecoverTask.java (original)
+++ geronimo/components/txmanager/trunk/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/RecoverTask.java Mon Feb 22 02:39:21 2010
@@ -28,7 +28,7 @@
 /**
  * @version $Rev$ $Date$
  */
-public class RecoverTask extends TimerTask {
+public class RecoverTask implements Runnable {
 
     private final RetryScheduler retryScheduler;
     private final NamedXAResourceFactory namedXAResourceFactory;

Modified: geronimo/components/txmanager/trunk/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/RetryScheduler.java
URL: http://svn.apache.org/viewvc/geronimo/components/txmanager/trunk/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/RetryScheduler.java?rev=912468&r1=912467&r2=912468&view=diff
==============================================================================
--- geronimo/components/txmanager/trunk/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/RetryScheduler.java (original)
+++ geronimo/components/txmanager/trunk/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/RetryScheduler.java Mon Feb 22 02:39:21 2010
@@ -27,5 +27,5 @@
  */
 public interface RetryScheduler {
 
-    void retry(TimerTask task, int count);
+    void retry(Runnable task, int count);
 }