X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fext%2Fvamsas%2FServiceHandle.java;h=428b5ea07959a18ec75aed9ca58862c185272387;hb=a83adb45bdf9554e270921b4baad94defd314b36;hp=442e5f7978edb7b7af1a5878cd4bf467ccae9933;hpb=ad15cff29620f960119f80176f1fd443da9f6763;p=jalview.git diff --git a/src/ext/vamsas/ServiceHandle.java b/src/ext/vamsas/ServiceHandle.java index 442e5f7..428b5ea 100755 --- a/src/ext/vamsas/ServiceHandle.java +++ b/src/ext/vamsas/ServiceHandle.java @@ -126,17 +126,18 @@ public class ServiceHandle implements java.io.Serializable private java.lang.Object __equalsCalc = null; + @Override public synchronized boolean equals(java.lang.Object obj) { - if (!(obj instanceof ServiceHandle)) + if (obj == null) { return false; } - ServiceHandle other = (ServiceHandle) obj; - if (obj == null) + if (!(obj instanceof ServiceHandle)) { return false; } + ServiceHandle other = (ServiceHandle) obj; if (this == obj) { return true; @@ -162,6 +163,7 @@ public class ServiceHandle implements java.io.Serializable private boolean __hashCodeCalc = false; + @Override public synchronized int hashCode() { if (__hashCodeCalc) @@ -191,7 +193,7 @@ public class ServiceHandle implements java.io.Serializable } // Type metadata - private static org.apache.axis.description.TypeDesc typeDesc = new org.apache.axis.description.TypeDesc( + private static final org.apache.axis.description.TypeDesc typeDesc = new org.apache.axis.description.TypeDesc( ServiceHandle.class, true); static