svn commit: r1776398 - in /felix/trunk/configadmin/src: main/java/org/apache/felix/cm/impl/ConfigurationAdapter.java main/java/org/apache/felix/cm/impl/ConfigurationImpl.java test/java/org/apache/felix/cm/impl/ConfigurationImplTest.java

[cz...@apache.org]

Author: cziegeler
Date: Thu Dec 29 10:54:18 2016
New Revision: 1776398

URL: http://svn.apache.org/viewvc?rev=1776398&view=rev
Log:
FELIX-5291 : Improving Configuration Updates

Added:
    felix/trunk/configadmin/src/test/java/org/apache/felix/cm/impl/ConfigurationImplTest.java   (with props)
Modified:
    felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationAdapter.java
    felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationImpl.java

Modified: felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationAdapter.java
URL: http://svn.apache.org/viewvc/felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationAdapter.java?rev=1776398&r1=1776397&r2=1776398&view=diff
==============================================================================
--- felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationAdapter.java (original)
+++ felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationAdapter.java Thu Dec 29 10:54:18 2016
@@ -192,7 +192,7 @@ public class ConfigurationAdapter implem
     @Override
     public void updateIfDifferent(final Dictionary<String, ?> properties) throws IOException
     {
-        Log.logger.log( LogService.LOG_DEBUG, "setProperties(properties={0})", new Object[]
+        Log.logger.log( LogService.LOG_DEBUG, "updateIfDifferent(properties={0})", new Object[]
                 { properties } );
 
         checkActive();

Modified: felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationImpl.java?rev=1776398&r1=1776397&r2=1776398&view=diff
==============================================================================
--- felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationImpl.java (original)
+++ felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationImpl.java Thu Dec 29 10:54:18 2016
@@ -720,7 +720,7 @@ public class ConfigurationImpl extends C
                             return false;
                         }
                     }
-                    if ( !val1.equals(val2) )
+                    else if ( !val1.equals(val2) )
                     {
                         return false;
                     }

Added: felix/trunk/configadmin/src/test/java/org/apache/felix/cm/impl/ConfigurationImplTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/configadmin/src/test/java/org/apache/felix/cm/impl/ConfigurationImplTest.java?rev=1776398&view=auto
==============================================================================
--- felix/trunk/configadmin/src/test/java/org/apache/felix/cm/impl/ConfigurationImplTest.java (added)
+++ felix/trunk/configadmin/src/test/java/org/apache/felix/cm/impl/ConfigurationImplTest.java Thu Dec 29 10:54:18 2016
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.felix.cm.impl;
+
+import static org.junit.Assert.assertTrue;
+
+import java.util.Dictionary;
+import java.util.Hashtable;
+
+import org.junit.Test;
+
+public class ConfigurationImplTest {
+
+    @Test public void testEqualsWithArrays() {
+        final Dictionary<String, Object> props1 = new Hashtable<String, Object>();
+        props1.put("array", new long[] {1,2});
+
+        final Dictionary<String, Object> props2 = new Hashtable<String, Object>();
+        props2.put("array", new long[] {1,2});
+
+        assertTrue(ConfigurationImpl.equals(props1, props2));
+
+        props2.put("array", new Long[] {1L,2L});
+        assertTrue(ConfigurationImpl.equals(props1, props2));
+    }
+}

Propchange: felix/trunk/configadmin/src/test/java/org/apache/felix/cm/impl/ConfigurationImplTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: felix/trunk/configadmin/src/test/java/org/apache/felix/cm/impl/ConfigurationImplTest.java
------------------------------------------------------------------------------
    svn:keywords = author date id revision rev url