Changeset 4125

Timestamp:

Feb 4, 2008, 8:29:03 PM (15 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #918: Adding multiple new DataFileTypes? to a platform or variant only saves the first one added

File:

• trunk/src/core/net/sf/basedb/core/data/FileTypeIndex.java (modified) (1 diff)

trunk/src/core/net/sf/basedb/core/data/FileTypeIndex.java

@@ -91 +91 @@
     FileTypeIndex other = (FileTypeIndex) o;
     // Same file type
-    if (this.fileType.getId() != other.fileType.getId()) return false;
-    // Same or no variant
-    if (this.variant == null && other.variant == null) return true;
-    if (this.variant != null && this.variant.equals(other.variant)) return true;
+    if (this.fileType.equals(other.fileType))
+    {
+      // Same or no variant
+      if ((this.variant == other.variant) || 
+        (this.variant != null && this.variant.equals(other.variant))) return true;
+    }
     return false;
   }