Merge develop to Release_2_8_3_Branch

[jalview.git] / src / ext / vamsas / ServiceHandles.java

diff --git a/src/ext/vamsas/ServiceHandles.java b/src/ext/vamsas/ServiceHandles.java
index 45c49d8..5ed466f 100755 (executable)
--- a/src/ext/vamsas/ServiceHandles.java
+++ b/src/ext/vamsas/ServiceHandles.java
@@ -57,15 +57,15 @@ public class ServiceHandles implements java.io.Serializable
 
   public synchronized boolean equals(java.lang.Object obj)
   {
-    if (!(obj instanceof ServiceHandles))
+    if (obj == null)
     {
       return false;
     }
-    ServiceHandles other = (ServiceHandles) obj;
-    if (obj == null)
+    if (!(obj instanceof ServiceHandles))
     {
       return false;
     }
+    ServiceHandles other = (ServiceHandles) obj;
     if (this == obj)
     {
       return true;