HADOOP-11369. Fix new findbugs warnings in hadoop-mapreduce-client, non-core directories. Contributed by Li Lu.

This commit is contained in:
Haohui Mai 2014-12-09 10:46:13 -08:00
parent 7bceb13ba9
commit d777a1e4ca
4 changed files with 5 additions and 4 deletions

View File

@ -536,6 +536,9 @@ Release 2.7.0 - UNRELEASED
HADOOP-11367. Fix warnings from findbugs 3.0 in hadoop-streaming. (Li Lu via wheat9) HADOOP-11367. Fix warnings from findbugs 3.0 in hadoop-streaming. (Li Lu via wheat9)
HADOOP-11369. Fix new findbugs warnings in hadoop-mapreduce-client,
non-core directories. (Li Lu via wheat9)
Release 2.6.0 - 2014-11-18 Release 2.6.0 - 2014-11-18
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

View File

@ -870,8 +870,7 @@ private void processEventForTimelineServer(HistoryEvent event, JobId jobId,
TaskAttemptStartedEvent tase = (TaskAttemptStartedEvent) event; TaskAttemptStartedEvent tase = (TaskAttemptStartedEvent) event;
tEvent.addEventInfo("TASK_TYPE", tase.getTaskType().toString()); tEvent.addEventInfo("TASK_TYPE", tase.getTaskType().toString());
tEvent.addEventInfo("TASK_ATTEMPT_ID", tEvent.addEventInfo("TASK_ATTEMPT_ID",
tase.getTaskAttemptId().toString() == null ? tase.getTaskAttemptId().toString());
"" : tase.getTaskAttemptId().toString());
tEvent.addEventInfo("START_TIME", tase.getStartTime()); tEvent.addEventInfo("START_TIME", tase.getStartTime());
tEvent.addEventInfo("HTTP_PORT", tase.getHttpPort()); tEvent.addEventInfo("HTTP_PORT", tase.getHttpPort());
tEvent.addEventInfo("TRACKER_NAME", tase.getTrackerName()); tEvent.addEventInfo("TRACKER_NAME", tase.getTrackerName());

View File

@ -76,7 +76,6 @@ public abstract class RMCommunicator extends AbstractService
protected EventHandler eventHandler; protected EventHandler eventHandler;
protected ApplicationMasterProtocol scheduler; protected ApplicationMasterProtocol scheduler;
private final ClientService clientService; private final ClientService clientService;
protected int lastResponseID;
private Resource maxContainerCapability; private Resource maxContainerCapability;
protected Map<ApplicationAccessType, String> applicationACLs; protected Map<ApplicationAccessType, String> applicationACLs;
private volatile long lastHeartbeatTime; private volatile long lastHeartbeatTime;

View File

@ -848,7 +848,7 @@ public void run() {
} }
}); });
} }
} else if (old != null && !old.isMovePending()) { } else if (!old.isMovePending()) {
//This is a duplicate so just delete it //This is a duplicate so just delete it
if (LOG.isDebugEnabled()) { if (LOG.isDebugEnabled()) {
LOG.debug("Duplicate: deleting"); LOG.debug("Duplicate: deleting");