Repository: hadoop Updated Branches: refs/heads/trunk dd0228b8f -> f250ad177
YARN-2731. Fixed RegisterApplicationMasterResponsePBImpl to properly invoke maybeInitBuilder. (Contributed by Carlo Curino) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f250ad17 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f250ad17 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f250ad17 Branch: refs/heads/trunk Commit: f250ad1773b19713d6aea81ae290ebb4c90fd44b Parents: dd0228b Author: Wangda Tan <wan...@apache.org> Authored: Tue Jan 20 14:42:41 2015 -0800 Committer: Wangda Tan <wan...@apache.org> Committed: Tue Jan 20 14:46:22 2015 -0800 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../impl/pb/RegisterApplicationMasterResponsePBImpl.java | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/f250ad17/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index a29d316..cab71a3 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -394,6 +394,9 @@ Release 2.7.0 - UNRELEASED YARN-2933. Capacity Scheduler preemption policy should only consider capacity without labels temporarily. (Mayank Bansal via wangda) + YARN-2731. Fixed RegisterApplicationMasterResponsePBImpl to properly invoke + maybeInitBuilder. (Carlo Curino via wangda) + Release 2.6.0 - 2014-11-18 INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/f250ad17/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/RegisterApplicationMasterResponsePBImpl.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/RegisterApplicationMasterResponsePBImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/RegisterApplicationMasterResponsePBImpl.java index 32dc85d..a95aadf 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/RegisterApplicationMasterResponsePBImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/RegisterApplicationMasterResponsePBImpl.java @@ -229,11 +229,11 @@ public class RegisterApplicationMasterResponsePBImpl extends @Override public void setClientToAMTokenMasterKey(ByteBuffer key) { + maybeInitBuilder(); if (key == null) { builder.clearClientToAmTokenMasterKey(); return; } - maybeInitBuilder(); builder.setClientToAmTokenMasterKey(ByteString.copyFrom(key)); } @@ -316,6 +316,7 @@ public class RegisterApplicationMasterResponsePBImpl extends @Override public void setNMTokensFromPreviousAttempts(final List<NMToken> nmTokens) { + maybeInitBuilder(); if (nmTokens == null || nmTokens.isEmpty()) { if (this.nmTokens != null) { this.nmTokens.clear();
