You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@helix.apache.org by lx...@apache.org on 2016/06/16 22:55:18 UTC
[1/2] helix git commit: Fixing an NPE when there is a session
mismatch in HelixTaskExecutor
Repository: helix
Updated Branches:
refs/heads/master f011ea3ee -> d32968fbd
Fixing an NPE when there is a session mismatch in HelixTaskExecutor
Signed-off-by: Adam Lugowski <al...@turn.com>
Project: http://git-wip-us.apache.org/repos/asf/helix/repo
Commit: http://git-wip-us.apache.org/repos/asf/helix/commit/a35c6365
Tree: http://git-wip-us.apache.org/repos/asf/helix/tree/a35c6365
Diff: http://git-wip-us.apache.org/repos/asf/helix/diff/a35c6365
Branch: refs/heads/master
Commit: a35c63656dd70e6aac2d8067a614bc98896202bd
Parents: 94e1079
Author: Adam Lugowski <al...@turn.com>
Authored: Mon Jun 13 18:31:45 2016 -0700
Committer: Adam Lugowski <al...@turn.com>
Committed: Mon Jun 13 18:31:45 2016 -0700
----------------------------------------------------------------------
.../org/apache/helix/messaging/handling/HelixTaskExecutor.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/helix/blob/a35c6365/helix-core/src/main/java/org/apache/helix/messaging/handling/HelixTaskExecutor.java
----------------------------------------------------------------------
diff --git a/helix-core/src/main/java/org/apache/helix/messaging/handling/HelixTaskExecutor.java b/helix-core/src/main/java/org/apache/helix/messaging/handling/HelixTaskExecutor.java
index 8a380c4..9680511 100644
--- a/helix-core/src/main/java/org/apache/helix/messaging/handling/HelixTaskExecutor.java
+++ b/helix-core/src/main/java/org/apache/helix/messaging/handling/HelixTaskExecutor.java
@@ -552,7 +552,8 @@ public class HelixTaskExecutor implements MessageListener, TaskExecutor {
SessionId tgtSessionId = message.getTypedTgtSessionId();
// sessionId mismatch normally means message comes from expired session, just remove it
- if (!sessionId.equals(tgtSessionId.toString()) && !tgtSessionId.toString().equals("*")) {
+ if (tgtSessionId == null ||
+ (!sessionId.equals(tgtSessionId.toString()) && !tgtSessionId.toString().equals("*"))) {
String warningMessage =
"SessionId does NOT match. expected sessionId: " + sessionId
+ ", tgtSessionId in message: " + tgtSessionId + ", messageId: "
[2/2] helix git commit: Merge branch 'fix-session-npe' of
https://github.com/turn/helix
Posted by lx...@apache.org.
Merge branch 'fix-session-npe' of https://github.com/turn/helix
Project: http://git-wip-us.apache.org/repos/asf/helix/repo
Commit: http://git-wip-us.apache.org/repos/asf/helix/commit/d32968fb
Tree: http://git-wip-us.apache.org/repos/asf/helix/tree/d32968fb
Diff: http://git-wip-us.apache.org/repos/asf/helix/diff/d32968fb
Branch: refs/heads/master
Commit: d32968fbd1d95c437747e2ecdafe730a6c898e9c
Parents: f011ea3 a35c636
Author: Lei Xia <lx...@linkedin.com>
Authored: Thu Jun 16 15:52:52 2016 -0700
Committer: Lei Xia <lx...@linkedin.com>
Committed: Thu Jun 16 15:52:52 2016 -0700
----------------------------------------------------------------------
.../org/apache/helix/messaging/handling/HelixTaskExecutor.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/helix/blob/d32968fb/helix-core/src/main/java/org/apache/helix/messaging/handling/HelixTaskExecutor.java
----------------------------------------------------------------------