Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

YARN-2731. Fixed RegisterApplicationMasterResponsePBImpl to properly invoke maybeInitBuilder. (Contributed by Carlo Curino) 

(cherry picked from commit f250ad1773)
This commit is contained in:
Wangda Tan 2015-01-20 14:42:41 -08:00
parent 09eee9bbc1
commit 610aa71a10
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-yarn-project/CHANGES.txt
View File

@ -360,6 +360,9 @@ Release 2.7.0 - UNRELEASED
YARN-2933. Capacity Scheduler preemption policy should only consider capacity YARN-2933. Capacity Scheduler preemption policy should only consider capacity
without labels temporarily. (Mayank Bansal via wangda) 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 Release 2.6.0 - 2014-11-18
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

3
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/RegisterApplicationMasterResponsePBImpl.java
View File

@ -229,11 +229,11 @@ public class RegisterApplicationMasterResponsePBImpl extends
@Override @Override
public void setClientToAMTokenMasterKey(ByteBuffer key) { public void setClientToAMTokenMasterKey(ByteBuffer key) {
maybeInitBuilder();
if (key == null) { if (key == null) {
builder.clearClientToAmTokenMasterKey(); builder.clearClientToAmTokenMasterKey();
return; return;
} }
maybeInitBuilder();
builder.setClientToAmTokenMasterKey(ByteString.copyFrom(key)); builder.setClientToAmTokenMasterKey(ByteString.copyFrom(key));
} }
@ -316,6 +316,7 @@ public class RegisterApplicationMasterResponsePBImpl extends
@Override @Override
public void setNMTokensFromPreviousAttempts(final List<NMToken> nmTokens) { public void setNMTokensFromPreviousAttempts(final List<NMToken> nmTokens) {
maybeInitBuilder();
if (nmTokens == null || nmTokens.isEmpty()) { if (nmTokens == null || nmTokens.isEmpty()) {
if (this.nmTokens != null) { if (this.nmTokens != null) {
this.nmTokens.clear(); this.nmTokens.clear();