diff options
author | Lukacs Berki <lberki@google.com> | 2016-11-15 10:56:26 +0000 |
---|---|---|
committer | Damien Martin-Guillerez <dmarting@google.com> | 2016-11-15 15:59:18 +0000 |
commit | 06662fe14ce23261bebd9f67df1976f7c2ed9f9d (patch) | |
tree | fc62ee92f6cd8488c4b575cb023124d21e95bee7 /src | |
parent | 3877ebd1733660b26c497534995e1152b2565cc6 (diff) |
Use #equals() to check equality between ExitCode instances.
--
MOS_MIGRATED_REVID=139180153
Diffstat (limited to 'src')
4 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/buildtool/BuildResult.java b/src/main/java/com/google/devtools/build/lib/buildtool/BuildResult.java index 42bf33d22f..8bbc62c107 100644 --- a/src/main/java/com/google/devtools/build/lib/buildtool/BuildResult.java +++ b/src/main/java/com/google/devtools/build/lib/buildtool/BuildResult.java @@ -82,7 +82,7 @@ public final class BuildResult { * True iff the build request has been successfully completed. */ public boolean getSuccess() { - return exitCondition == ExitCode.SUCCESS; + return exitCondition.equals(ExitCode.SUCCESS); } /** diff --git a/src/main/java/com/google/devtools/build/lib/buildtool/BuildTool.java b/src/main/java/com/google/devtools/build/lib/buildtool/BuildTool.java index 9857283f62..522f753586 100644 --- a/src/main/java/com/google/devtools/build/lib/buildtool/BuildTool.java +++ b/src/main/java/com/google/devtools/build/lib/buildtool/BuildTool.java @@ -503,7 +503,7 @@ public final class BuildTool { * a thrown exception somewhere along the way. */ public void stopRequest(BuildResult result, Throwable crash, ExitCode exitCondition) { - Preconditions.checkState((crash == null) || (exitCondition != ExitCode.SUCCESS)); + Preconditions.checkState((crash == null) || !exitCondition.equals(ExitCode.SUCCESS)); result.setUnhandledThrowable(crash); result.setExitCondition(exitCondition); // The stop time has to be captured before we send the BuildCompleteEvent. diff --git a/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcher.java b/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcher.java index 6a105139fe..d13963f7bc 100644 --- a/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcher.java +++ b/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcher.java @@ -391,7 +391,7 @@ public class BlazeCommandDispatcher { } ExitCode result = checkCwdInWorkspace(env, commandAnnotation, commandName, outErr); - if (result != ExitCode.SUCCESS) { + if (!result.equals(ExitCode.SUCCESS)) { return result.getNumericExitCode(); } diff --git a/src/main/java/com/google/devtools/build/lib/runtime/commands/RunCommand.java b/src/main/java/com/google/devtools/build/lib/runtime/commands/RunCommand.java index ca2b04a2a9..d76ea1dd6e 100644 --- a/src/main/java/com/google/devtools/build/lib/runtime/commands/RunCommand.java +++ b/src/main/java/com/google/devtools/build/lib/runtime/commands/RunCommand.java @@ -177,7 +177,7 @@ public class RunCommand implements BlazeCommand { } for (ConfiguredTarget target : targetsBuilt) { ExitCode targetValidation = fullyValidateTarget(env, target); - if (targetValidation != ExitCode.SUCCESS) { + if (!targetValidation.equals(ExitCode.SUCCESS)) { return targetValidation; } if (runUnder != null && target.getLabel().equals(runUnder.getLabel())) { |