X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fuk%2Fac%2Fvamsas%2Fobjects%2Fcore%2FScore.java;h=357deb284994ae103d6d34f9d88141e459132c75;hb=1890f014c0a312a7a2203c878e4802e3eb914e47;hp=8448198457ffb2cf7581d849bd74e25db52e206a;hpb=de558440c776d39285b02d970a21df7002e85a3c;p=vamsas.git

diff --git a/src/uk/ac/vamsas/objects/core/Score.java b/src/uk/ac/vamsas/objects/core/Score.java
index 8448198..357deb2 100644
--- a/src/uk/ac/vamsas/objects/core/Score.java
+++ b/src/uk/ac/vamsas/objects/core/Score.java
@@ -83,16 +83,33 @@ implements java.io.Serializable
         if (obj instanceof Score) {
         
             Score temp = (Score)obj;
+            boolean thcycle;
+            boolean tmcycle;
             if (this._content != temp._content)
                 return false;
             if (this._has_content != temp._has_content)
                 return false;
             if (this._name != null) {
                 if (temp._name == null) return false;
-                else if (!(this._name.equals(temp._name))) 
-                    return false;
-            }
-            else if (temp._name != null)
+                if (this._name != temp._name) {
+                    thcycle=org.castor.util.CycleBreaker.startingToCycle(this._name);
+                    tmcycle=org.castor.util.CycleBreaker.startingToCycle(temp._name);
+                    if (thcycle!=tmcycle) {
+                        if (!thcycle) { org.castor.util.CycleBreaker.releaseCycleHandle(this._name); };
+                        if (!tmcycle) { org.castor.util.CycleBreaker.releaseCycleHandle(temp._name); };
+                        return false;
+                    }
+                    if (!thcycle) {
+                        if (!this._name.equals(temp._name)) {
+                            org.castor.util.CycleBreaker.releaseCycleHandle(this._name);
+                            org.castor.util.CycleBreaker.releaseCycleHandle(temp._name);
+                            return false;
+                        }
+                        org.castor.util.CycleBreaker.releaseCycleHandle(this._name);
+                        org.castor.util.CycleBreaker.releaseCycleHandle(temp._name);
+                    }
+                }
+            } else if (temp._name != null)
                 return false;
             return true;
         }
@@ -144,8 +161,10 @@ implements java.io.Serializable
         
         long tmp;
         result = 37 * result + java.lang.Float.floatToIntBits(_content);
-        if (_name != null) {
+        if (_name != null
+            && !org.castor.util.CycleBreaker.startingToCycle(_name)) {
            result = 37 * result + _name.hashCode();
+           org.castor.util.CycleBreaker.releaseCycleHandle(_name);
         }
         
         return result;