X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fvamsas%2Fobjects%2Fsimple%2FWsJobId.java;h=83c1c2f6fb9492c869fcc2bbaa6bc5e9a0278e28;hb=e9a1c2c372f4bbf6cf658de3dba73ef326b20c20;hp=3419899c6abe1c39605dee46f6686ba447d244a2;hpb=ad15cff29620f960119f80176f1fd443da9f6763;p=jalview.git diff --git a/src/vamsas/objects/simple/WsJobId.java b/src/vamsas/objects/simple/WsJobId.java index 3419899..83c1c2f 100755 --- a/src/vamsas/objects/simple/WsJobId.java +++ b/src/vamsas/objects/simple/WsJobId.java @@ -78,24 +78,30 @@ public class WsJobId implements java.io.Serializable private java.lang.Object __equalsCalc = null; + @Override public synchronized boolean equals(java.lang.Object obj) { + if (obj == null) + { + return false; + } if (!(obj instanceof WsJobId)) + { return false; + } WsJobId other = (WsJobId) obj; - if (obj == null) - return false; if (this == obj) + { return true; + } if (__equalsCalc != null) { return (__equalsCalc == obj); } __equalsCalc = obj; boolean _equals; - _equals = true - && ((this.jobId == null && other.getJobId() == null) || (this.jobId != null && this.jobId - .equals(other.getJobId()))) + _equals = true && ((this.jobId == null && other.getJobId() == null) + || (this.jobId != null && this.jobId.equals(other.getJobId()))) && this.status == other.getStatus(); __equalsCalc = null; return _equals; @@ -103,6 +109,7 @@ public class WsJobId implements java.io.Serializable private boolean __hashCodeCalc = false; + @Override public synchronized int hashCode() { if (__hashCodeCalc)