JAL-2089 patch broken merge to master for Release 2.10.0b1

[jalview.git] / src / vamsas / objects / simple / MsaResult.java

diff --git a/src/vamsas/objects/simple/MsaResult.java b/src/vamsas/objects/simple/MsaResult.java
index 30a5414..49fa4a7 100755 (executable)
--- a/src/vamsas/objects/simple/MsaResult.java
+++ b/src/vamsas/objects/simple/MsaResult.java
@@ -58,20 +58,20 @@ public class MsaResult extends vamsas.objects.simple.Result implements
     this.msa = msa;
   }
 
+  @Override
   public synchronized boolean equals(java.lang.Object obj)
   {
-    if (!(obj instanceof MsaResult))
+    if (obj == null)
     {
       return false;
     }
-
-    MsaResult other = (MsaResult) obj;
-
-    if (obj == null)
+    if (!(obj instanceof MsaResult))
     {
       return false;
     }
 
+    MsaResult other = (MsaResult) obj;
+
     if (this == obj)
     {
       return true;
@@ -93,6 +93,7 @@ public class MsaResult extends vamsas.objects.simple.Result implements
     return _equals;
   }
 
+  @Override
   public synchronized int hashCode()
   {
     if (__hashCodeCalc)