Merge branch 'bug/JAL-1923_290b2_group_annots' into Release_2_9_0b1_Branch

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

diff --git a/src/ext/vamsas/ServiceHandles.java b/src/ext/vamsas/ServiceHandles.java
index a0156c1..e667683 100755 (executable)
--- a/src/ext/vamsas/ServiceHandles.java
+++ b/src/ext/vamsas/ServiceHandles.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b1)
+ * Copyright (C) 2015 The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -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;