[bugfix] Try to ensure that the configurator does not reorder the values

of lists. Closes #583
eXist-db · Apr 9, 2015 · c33c14d · c33c14d
1 parent f910822
commit c33c14d
Show file tree

Hide file tree

Showing 5 changed files with 179 additions and 112 deletions.
diff --git a/src/org/exist/config/Configuration.java b/src/org/exist/config/Configuration.java
@@ -23,6 +23,7 @@
 
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 
 import org.exist.security.PermissionDeniedException;
@@ -166,7 +167,14 @@ public interface Configuration {
      */
     public void save(DBBroker broker) throws PermissionDeniedException, ConfigurationException;
 
-    public boolean equals(Object obj, String uniqField);
+    /**
+     * Determines equality based on a property value of the configuration
+     *
+     * @param obj The Configured instance
+     * @param property The name of the property to use for comparison, or
+     *                 if empty, the {@link ConfigurationImpl#ID} is used.
+     */
+    public boolean equals(Object obj, Optional<String> property);
 
     /**
      * Free up memory allocated for cache.

diff --git a/src/org/exist/config/ConfigurationImpl.java b/src/org/exist/config/ConfigurationImpl.java
@@ -22,13 +22,9 @@
 package org.exist.config;
 
 import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
+import jdk.nashorn.internal.runtime.regexp.joni.Config;
 import org.exist.dom.persistent.DocumentImpl;
 import org.exist.security.PermissionDeniedException;
 import org.exist.storage.DBBroker;
@@ -461,33 +457,24 @@ public void save(final DBBroker broker) throws PermissionDeniedException, Config
     }
 
     @Override
-    public boolean equals(Object obj) {
-        if (obj instanceof ConfigurationImpl) {
-            final ConfigurationImpl conf = (ConfigurationImpl)obj;
-            if (!(getName().equals(conf.getName())))
-                {return false;}
-            final String id = getProperty(Configuration.ID);
-            if (id == null) {
-                return false;
-            }
-            if (id.equals(conf.getProperty(Configuration.ID)))
-                {return true;}
-        }
-        return false;
+    public boolean equals(final Object obj) {
+        return equals(obj, Optional.empty());
     }
 
-    public boolean equals(Object obj, String uniqField) {
+    @Override
+    public boolean equals(final Object obj, final Optional<String> property) {
         if (obj instanceof ConfigurationImpl) {
             final ConfigurationImpl conf = (ConfigurationImpl)obj;
-            if (!(getName().equals(conf.getName())))
-                {return false;}
-            final String uniq = getProperty( uniqField);
-            if (uniq == null) {
+            if (!(getName().equals(conf.getName()))) {
                 return false;
             }
-            if (uniq.equals(conf.getProperty(uniqField)))
-                {return true;}
+
+            final String name = property.orElse(Configuration.ID);
+            final Optional<String> value = Optional.ofNullable(getProperty(name));
+
+            return value.map(v -> v.equals(conf.getProperty(name))).orElse(false);
         }
+
         return false;
     }
 }