helix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zzh...@apache.org
Subject git commit: fix test failire
Date Wed, 03 Apr 2013 22:05:04 GMT
Updated Branches:
  refs/heads/master 1e5d5f5cb -> de5dcd293


fix test failire


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

Branch: refs/heads/master
Commit: de5dcd293aacc4df2d9a699fa281f52291515c38
Parents: 1e5d5f5
Author: zzhang <zzhang@apache.org>
Authored: Wed Apr 3 14:59:17 2013 -0700
Committer: zzhang <zzhang@apache.org>
Committed: Wed Apr 3 14:59:17 2013 -0700

----------------------------------------------------------------------
 .../helix/participant/statemachine/StateModel.java |    2 +-
 .../helix/mock/participant/MockMSStateModel.java   |    7 +------
 .../helix/mock/participant/SleepTransition.java    |    7 -------
 3 files changed, 2 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/de5dcd29/helix-core/src/main/java/org/apache/helix/participant/statemachine/StateModel.java
----------------------------------------------------------------------
diff --git a/helix-core/src/main/java/org/apache/helix/participant/statemachine/StateModel.java
b/helix-core/src/main/java/org/apache/helix/participant/statemachine/StateModel.java
index 01890f8..014dce9 100644
--- a/helix-core/src/main/java/org/apache/helix/participant/statemachine/StateModel.java
+++ b/helix-core/src/main/java/org/apache/helix/participant/statemachine/StateModel.java
@@ -84,7 +84,7 @@ public abstract class StateModel
 	 * @throws InterruptedException
 	 */
   @Transition(to = "DROPPED", from = "ERROR")
-  public void onBecomeDroppedFromError(Message message, NotificationContext context)
+  public void defaultOnBecomeDroppedFromError(Message message, NotificationContext context)
   {
     logger.info("Default ERROR->DROPPED transition invoked.");
   }

http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/de5dcd29/helix-core/src/test/java/org/apache/helix/mock/participant/MockMSStateModel.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/mock/participant/MockMSStateModel.java
b/helix-core/src/test/java/org/apache/helix/mock/participant/MockMSStateModel.java
index a523abd..d606e13 100644
--- a/helix-core/src/test/java/org/apache/helix/mock/participant/MockMSStateModel.java
+++ b/helix-core/src/test/java/org/apache/helix/mock/participant/MockMSStateModel.java
@@ -46,17 +46,12 @@ public class MockMSStateModel extends StateModel
 
   // overwrite default error->dropped transition
   @Transition(to = "DROPPED", from = "ERROR")
-  public void onBecomeDroppedFromError(Message message, NotificationContext context)
+  public void onBecomeDroppedFromError(Message message, NotificationContext context) throws
InterruptedException
   {
     LOG.info("Become DROPPED from ERROR");
     if (_transition != null)
     {
-      try
-      {
         _transition.doTransition(message, context);
-      }
-      catch(Exception e)
-      {}
     }
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/de5dcd29/helix-core/src/test/java/org/apache/helix/mock/participant/SleepTransition.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/mock/participant/SleepTransition.java
b/helix-core/src/test/java/org/apache/helix/mock/participant/SleepTransition.java
index 68de72b..3b28e9a 100644
--- a/helix-core/src/test/java/org/apache/helix/mock/participant/SleepTransition.java
+++ b/helix-core/src/test/java/org/apache/helix/mock/participant/SleepTransition.java
@@ -35,13 +35,6 @@ public class SleepTransition extends MockTransition
   @Override
   public void doTransition(Message message, NotificationContext context) throws InterruptedException
   {
-    try {
       Thread.sleep(_delay);
-    } catch (InterruptedException e) {
-      // TODO Auto-generated catch block
-      e.printStackTrace();
-      throw e;
-    }
-
   }
 }


Mime
View raw message