You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@helix.apache.org by sl...@apache.org on 2013/04/03 20:44:58 UTC

git commit: [HELIX-133] cleanup internal timer when timeout happens on the message handling

Updated Branches:
  refs/heads/master 58944dc4b -> 1e5d5f5cb


[HELIX-133] cleanup internal timer when timeout happens on the message
handling

Project: http://git-wip-us.apache.org/repos/asf/incubator-helix/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-helix/commit/1e5d5f5c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-helix/tree/1e5d5f5c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-helix/diff/1e5d5f5c

Branch: refs/heads/master
Commit: 1e5d5f5cbb5f1aa167d53e887979907a8809370c
Parents: 58944dc
Author: slu2011 <lu...@gmail.com>
Authored: Wed Apr 3 11:44:36 2013 -0700
Committer: slu2011 <lu...@gmail.com>
Committed: Wed Apr 3 11:44:36 2013 -0700

----------------------------------------------------------------------
 .../org/apache/helix/messaging/AsyncCallback.java  |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/1e5d5f5c/helix-core/src/main/java/org/apache/helix/messaging/AsyncCallback.java
----------------------------------------------------------------------
diff --git a/helix-core/src/main/java/org/apache/helix/messaging/AsyncCallback.java b/helix-core/src/main/java/org/apache/helix/messaging/AsyncCallback.java
index a1bc2ea..6fd04cf 100644
--- a/helix-core/src/main/java/org/apache/helix/messaging/AsyncCallback.java
+++ b/helix-core/src/main/java/org/apache/helix/messaging/AsyncCallback.java
@@ -166,6 +166,13 @@ public abstract class AsyncCallback
       {
         _logger.error(e);
       }
+      finally
+      {
+        if(_timer != null)
+        {
+          _timer.cancel();
+        }
+      }
     }
   }