You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by cs...@apache.org on 2019/11/18 08:20:38 UTC
[aries] branch trunk updated: Fixed bug causing array properties to
not evaluate as equal
This is an automated email from the ASF dual-hosted git repository.
cschneider pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/aries.git
The following commit(s) were added to refs/heads/trunk by this push:
new 62d2997 Fixed bug causing array properties to not evaluate as equal
62d2997 is described below
commit 62d29975a3bbf639d0d8e09ef72348ed1b26ba3d
Author: Shannon Gallagher <sh...@connexta.com>
AuthorDate: Wed Dec 12 13:11:59 2018 -0700
Fixed bug causing array properties to not evaluate as equal
---
.../aries/blueprint/compendium/cm/CmPropertyPlaceholder.java | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/CmPropertyPlaceholder.java b/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/CmPropertyPlaceholder.java
index 840d3c6..1af990a 100644
--- a/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/CmPropertyPlaceholder.java
+++ b/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/CmPropertyPlaceholder.java
@@ -18,6 +18,7 @@
*/
package org.apache.aries.blueprint.compendium.cm;
+import java.util.Arrays;
import java.util.Dictionary;
import java.util.Enumeration;
import java.util.Properties;
@@ -40,7 +41,7 @@ public class CmPropertyPlaceholder extends PropertyPlaceholderExt implements Man
private static final Logger LOGGER = LoggerFactory.getLogger(CmPropertyPlaceholder.class);
private ExtendedBlueprintContainer blueprintContainer;
- private ConfigurationAdmin configAdmin;
+ private ConfigurationAdmin configAdmin;
private String persistentId;
private String updateStrategy;
private ManagedObjectManager managedObjectManager;
@@ -154,10 +155,12 @@ public class CmPropertyPlaceholder extends PropertyPlaceholderExt implements Man
if (v2 != null) {
return false;
}
- } else {
- if (!v1.equals(v2)) {
+ } else if (v1 instanceof Object[] && v2 instanceof Object[]) {
+ if (!Arrays.deepEquals((Object[]) v1, (Object[]) v2)) {
return false;
}
+ } else if (!v1.equals(v2)) {
+ return false;
}
}
return true;