Skip to content

Commit 9837015

Browse files
author
Minni Mittal
committed
checkstyle fix
1 parent d19d50d commit 9837015

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/AllocateResponsePBImpl.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,7 @@ public synchronized void setAMRMToken(Token amRMToken) {
429429
}
430430

431431
@Override
432-
public EnhancedHeadroom getEnhancedHeadroom() {
432+
public synchronized EnhancedHeadroom getEnhancedHeadroom() {
433433
AllocateResponseProtoOrBuilder p = viaProto ? proto : builder;
434434
if (enhancedHeadroom != null) {
435435
return enhancedHeadroom;
@@ -442,7 +442,8 @@ public EnhancedHeadroom getEnhancedHeadroom() {
442442
}
443443

444444
@Override
445-
public void setEnhancedHeadroom(EnhancedHeadroom enhancedHeadroom) {
445+
public synchronized void setEnhancedHeadroom(
446+
EnhancedHeadroom enhancedHeadroom) {
446447
maybeInitBuilder();
447448
if (enhancedHeadroom == null) {
448449
builder.clearEnhancedHeadroom();

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/EnhancedHeadroomPBImpl.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,9 @@ public int hashCode() {
5454

5555
@Override
5656
public boolean equals(Object other) {
57-
if (other == null)
57+
if (other == null) {
5858
return false;
59+
}
5960
if (other.getClass().isAssignableFrom(this.getClass())) {
6061
return this.getProto().equals(this.getClass().cast(other).getProto());
6162
}
@@ -72,8 +73,9 @@ private void mergeLocalToBuilder() {
7273
}
7374

7475
private void mergeLocalToProto() {
75-
if (viaProto)
76+
if (viaProto) {
7677
maybeInitBuilder();
78+
}
7779
mergeLocalToBuilder();
7880
proto = builder.build();
7981
viaProto = true;

0 commit comments

Comments
 (0)