X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fuk%2Fac%2Febi%2Fwww%2FData.java;h=2020fc9f27ae24f580250e032d111b407cb37805;hb=37de9310bec3501cbc6381e0c3dcb282fcaad812;hp=b12de7044def8542b7881bd1aba1da3f488eb5d0;hpb=ad15cff29620f960119f80176f1fd443da9f6763;p=jalview.git diff --git a/src/uk/ac/ebi/www/Data.java b/src/uk/ac/ebi/www/Data.java index b12de70..2020fc9 100755 --- a/src/uk/ac/ebi/www/Data.java +++ b/src/uk/ac/ebi/www/Data.java @@ -52,17 +52,18 @@ public class Data implements java.io.Serializable private java.lang.Object __equalsCalc = null; + @Override public synchronized boolean equals(java.lang.Object obj) { - if (!(obj instanceof Data)) + if (obj == null) { return false; } - Data other = (Data) obj; - if (obj == null) + if (!(obj instanceof Data)) { return false; } + Data other = (Data) obj; if (this == obj) { return true; @@ -84,6 +85,7 @@ public class Data implements java.io.Serializable private boolean __hashCodeCalc = false; + @Override public synchronized int hashCode() { if (__hashCodeCalc)