X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fext%2Fvamsas%2FServiceHandle.java;h=7d276951b00cde462dd597291862f2ae04a86ef0;hb=62752cf082f3305585bd9c23cac78213ef1ccd59;hp=442e5f7978edb7b7af1a5878cd4bf467ccae9933;hpb=ad15cff29620f960119f80176f1fd443da9f6763;p=jalview.git

diff --git a/src/ext/vamsas/ServiceHandle.java b/src/ext/vamsas/ServiceHandle.java
index 442e5f7..7d27695 100755
--- a/src/ext/vamsas/ServiceHandle.java
+++ b/src/ext/vamsas/ServiceHandle.java
@@ -128,15 +128,15 @@ public class ServiceHandle implements java.io.Serializable
 
   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;
@@ -148,14 +148,19 @@ public class ServiceHandle implements java.io.Serializable
     __equalsCalc = obj;
     boolean _equals;
     _equals = true
-            && ((this.abstractName == null && other.getAbstractName() == null) || (this.abstractName != null && this.abstractName
-                    .equals(other.getAbstractName())))
-            && ((this.description == null && other.getDescription() == null) || (this.description != null && this.description
-                    .equals(other.getDescription())))
-            && ((this.endpointURL == null && other.getEndpointURL() == null) || (this.endpointURL != null && this.endpointURL
-                    .equals(other.getEndpointURL())))
-            && ((this.name == null && other.getName() == null) || (this.name != null && this.name
-                    .equals(other.getName())));
+            && ((this.abstractName == null
+                    && other.getAbstractName() == null)
+                    || (this.abstractName != null && this.abstractName
+                            .equals(other.getAbstractName())))
+            && ((this.description == null && other.getDescription() == null)
+                    || (this.description != null && this.description
+                            .equals(other.getDescription())))
+            && ((this.endpointURL == null && other.getEndpointURL() == null)
+                    || (this.endpointURL != null && this.endpointURL
+                            .equals(other.getEndpointURL())))
+            && ((this.name == null && other.getName() == null)
+                    || (this.name != null
+                            && this.name.equals(other.getName())));
     __equalsCalc = null;
     return _equals;
   }