helix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zzh...@apache.org
Subject git commit: fix failing tests
Date Wed, 27 Mar 2013 17:39:00 GMT
Updated Branches:
  refs/heads/master 1e36a882b -> da01293ac


fix failing tests


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

Branch: refs/heads/master
Commit: da01293ac928f4a204d3212b9cbe02c6c4106f18
Parents: 1e36a88
Author: zzhang <zzhang5@uci.edu>
Authored: Wed Mar 27 10:38:54 2013 -0700
Committer: zzhang <zzhang5@uci.edu>
Committed: Wed Mar 27 10:38:54 2013 -0700

----------------------------------------------------------------------
 .../helix/manager/zk/CurStateCarryOverUpdater.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/da01293a/helix-core/src/main/java/org/apache/helix/manager/zk/CurStateCarryOverUpdater.java
----------------------------------------------------------------------
diff --git a/helix-core/src/main/java/org/apache/helix/manager/zk/CurStateCarryOverUpdater.java
b/helix-core/src/main/java/org/apache/helix/manager/zk/CurStateCarryOverUpdater.java
index f35f2e8..9931c22 100644
--- a/helix-core/src/main/java/org/apache/helix/manager/zk/CurStateCarryOverUpdater.java
+++ b/helix-core/src/main/java/org/apache/helix/manager/zk/CurStateCarryOverUpdater.java
@@ -52,6 +52,8 @@ class CurStateCarryOverUpdater implements DataUpdater<ZNRecord> {
     CurrentState curState = null;
     if (currentData == null) {
       curState = new CurrentState(_lastCurState.getId());
+      // copy all simple fields settings and overwrite session-id to current session
+      curState.getRecord().setSimpleFields(_lastCurState.getRecord().getSimpleFields());
       curState.setSessionId(_curSessionId);
     } else
     {


Mime
View raw message