You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2015/03/14 18:13:08 UTC
karaf-cellar git commit: [KARAF-3617] Fix config sync pulling behavior
Repository: karaf-cellar
Updated Branches:
refs/heads/cellar-2.3.x 899a80f1c -> 0ddfe3346
[KARAF-3617] Fix config sync pulling behavior
Project: http://git-wip-us.apache.org/repos/asf/karaf-cellar/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-cellar/commit/0ddfe334
Tree: http://git-wip-us.apache.org/repos/asf/karaf-cellar/tree/0ddfe334
Diff: http://git-wip-us.apache.org/repos/asf/karaf-cellar/diff/0ddfe334
Branch: refs/heads/cellar-2.3.x
Commit: 0ddfe3346d9bc2b87fa9f1bfbc1f8b0362b573d0
Parents: 899a80f
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Sat Mar 14 18:11:42 2015 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Sat Mar 14 18:11:42 2015 +0100
----------------------------------------------------------------------
.../config/ConfigurationSynchronizer.java | 24 ++++++++++----------
1 file changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/0ddfe334/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSynchronizer.java
----------------------------------------------------------------------
diff --git a/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSynchronizer.java b/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSynchronizer.java
index 6ee686f..e675de9 100644
--- a/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSynchronizer.java
+++ b/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSynchronizer.java
@@ -76,7 +76,7 @@ public class ConfigurationSynchronizer extends ConfigurationSupport implements S
}
}
if (policy != null && policy.equalsIgnoreCase("node")) {
- LOGGER.debug("CELLAR CONFIG: sync policy is set as 'cluster' for cluster group " + group.getName());
+ LOGGER.debug("CELLAR CONFIG: sync policy is set as 'node' for cluster group " + group.getName());
push(group);
}
}
@@ -97,26 +97,26 @@ public class ConfigurationSynchronizer extends ConfigurationSupport implements S
try {
Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
- for (String clusterPID : clusterConfigurations.keySet()) {
- if (isAllowed(group, Constants.CATEGORY, clusterPID, EventType.INBOUND)) {
- Dictionary clusterDictionary = clusterConfigurations.get(clusterPID);
+ for (String pid : clusterConfigurations.keySet()) {
+ if (isAllowed(group, Constants.CATEGORY, pid, EventType.INBOUND)) {
+ Dictionary clusterDictionary = clusterConfigurations.get(pid);
try {
// update the local configuration if needed
- Configuration localConfiguration = configurationAdmin.getConfiguration(clusterPID, null);
+ Configuration localConfiguration = configurationAdmin.getConfiguration(pid, null);
Dictionary localDictionary = localConfiguration.getProperties();
if (localDictionary == null)
localDictionary = new Properties();
localDictionary = filter(localDictionary);
- if (!equals(localDictionary, clusterDictionary)) {
- localConfiguration.update(localDictionary);
- persistConfiguration(configurationAdmin, clusterPID, localDictionary);
+ if (!equals(clusterDictionary, localDictionary)) {
+ localConfiguration.update((Dictionary) clusterDictionary);
+ persistConfiguration(configurationAdmin, pid, clusterDictionary);
}
} catch (IOException ex) {
LOGGER.error("CELLAR CONFIG: failed to update local configuration", ex);
}
}
- LOGGER.debug("CELLAR CONFIG: configuration with PID {} is marked BLOCKED INBOUND for cluster group {}", clusterPID, groupName);
+ LOGGER.debug("CELLAR CONFIG: configuration with PID {} is marked BLOCKED INBOUND for cluster group {}", pid, groupName);
}
} finally {
Thread.currentThread().setContextClassLoader(originalClassLoader);
@@ -147,10 +147,10 @@ public class ConfigurationSynchronizer extends ConfigurationSupport implements S
Configuration[] localConfigurations;
try {
localConfigurations = configurationAdmin.listConfigurations(null);
- for (Configuration conf : localConfigurations) {
- String pid = conf.getPid();
+ for (Configuration localConfiguration : localConfigurations) {
+ String pid = localConfiguration.getPid();
if (isAllowed(group, Constants.CATEGORY, pid, EventType.OUTBOUND)) {
- Dictionary localDictionary = conf.getProperties();
+ Dictionary localDictionary = localConfiguration.getProperties();
localDictionary = filter(localDictionary);
// update the configurations in the cluster group
clusterConfigurations.put(pid, dictionaryToProperties(localDictionary));