X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fvamsas%2Fobjects%2Fsimple%2FResult.java;fp=src%2Fvamsas%2Fobjects%2Fsimple%2FResult.java;h=170a1b52c0a935e81997d78d4d4fda8cc766a3c2;hb=3459a8a691cb22508d7067f240b7254e588e77d3;hp=87f0a4864195819d63585d75024d06514904361e;hpb=5b27f1062b2203c4c31702e205f4c78e1992063e;p=jalview.git diff --git a/src/vamsas/objects/simple/Result.java b/src/vamsas/objects/simple/Result.java index 87f0a48..170a1b5 100755 --- a/src/vamsas/objects/simple/Result.java +++ b/src/vamsas/objects/simple/Result.java @@ -310,8 +310,7 @@ public class Result implements java.io.Serializable } __equalsCalc = obj; boolean _equals; - _equals = true - && this.broken == other.isBroken() + _equals = true && this.broken == other.isBroken() && this.failed == other.isFailed() && this.finished == other.isFinished() && this.invalid == other.isInvalid() @@ -320,8 +319,9 @@ public class Result implements java.io.Serializable && this.running == other.isRunning() && this.serverError == other.isServerError() && this.state == other.getState() - && ((this.status == null && other.getStatus() == null) || (this.status != null && this.status - .equals(other.getStatus()))) + && ((this.status == null && other.getStatus() == null) + || (this.status != null + && this.status.equals(other.getStatus()))) && this.suspended == other.isSuspended(); __equalsCalc = null; return _equals;