sequence mappings and DbRef mapping objects unified and source binding for castor...

[vamsas.git] / src / uk / ac / vamsas / objects / core / Provenance.java

diff --git a/src/uk/ac/vamsas/objects/core/Provenance.java b/src/uk/ac/vamsas/objects/core/Provenance.java
index 3477b22..12dc17b 100644 (file)
--- a/src/uk/ac/vamsas/objects/core/Provenance.java
+++ b/src/uk/ac/vamsas/objects/core/Provenance.java
@@ -104,12 +104,29 @@ implements java.io.Serializable
         if (obj instanceof Provenance) {
         
             Provenance temp = (Provenance)obj;
+            boolean thcycle;
+            boolean tmcycle;
             if (this._entryList != null) {
                 if (temp._entryList == null) return false;
-                else if (!(this._entryList.equals(temp._entryList))) 
-                    return false;
-            }
-            else if (temp._entryList != null)
+                if (this._entryList != temp._entryList) {
+                    thcycle=org.castor.util.CycleBreaker.startingToCycle(this._entryList);
+                    tmcycle=org.castor.util.CycleBreaker.startingToCycle(temp._entryList);
+                    if (thcycle!=tmcycle) {
+                        if (!thcycle) { org.castor.util.CycleBreaker.releaseCycleHandle(this._entryList); };
+                        if (!tmcycle) { org.castor.util.CycleBreaker.releaseCycleHandle(temp._entryList); };
+                        return false;
+                    }
+                    if (!thcycle) {
+                        if (!this._entryList.equals(temp._entryList)) {
+                            org.castor.util.CycleBreaker.releaseCycleHandle(this._entryList);
+                            org.castor.util.CycleBreaker.releaseCycleHandle(temp._entryList);
+                            return false;
+                        }
+                        org.castor.util.CycleBreaker.releaseCycleHandle(this._entryList);
+                        org.castor.util.CycleBreaker.releaseCycleHandle(temp._entryList);
+                    }
+                }
+            } else if (temp._entryList != null)
                 return false;
             return true;
         }
@@ -186,8 +203,10 @@ implements java.io.Serializable
         int result = super.hashCode();
         
         long tmp;
-        if (_entryList != null) {
+        if (_entryList != null
+            && !org.castor.util.CycleBreaker.startingToCycle(_entryList)) {
            result = 37 * result + _entryList.hashCode();
+           org.castor.util.CycleBreaker.releaseCycleHandle(_entryList);
         }
         
         return result;