You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2015/03/05 10:51:09 UTC
[2/3] karaf git commit: [KARAF-3577] Avoid binding the configuration
to the bundle
[KARAF-3577] Avoid binding the configuration to the bundle
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/d91008dd
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/d91008dd
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/d91008dd
Branch: refs/heads/karaf-2.x
Commit: d91008dd34960576475ffa40151fc49e14d53027
Parents: 067a7fc
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Mon Mar 2 13:16:36 2015 +0100
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Thu Mar 5 10:50:45 2015 +0100
----------------------------------------------------------------------
.../shell/security/impl/SecuredCommandConfigTransformer.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/d91008dd/shell/console/src/main/java/org/apache/karaf/shell/security/impl/SecuredCommandConfigTransformer.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/security/impl/SecuredCommandConfigTransformer.java b/shell/console/src/main/java/org/apache/karaf/shell/security/impl/SecuredCommandConfigTransformer.java
index ba9cd91..3b44765 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/security/impl/SecuredCommandConfigTransformer.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/security/impl/SecuredCommandConfigTransformer.java
@@ -117,7 +117,7 @@ public class SecuredCommandConfigTransformer implements ConfigurationListener {
// update config admin with the generated configuration
for (Map.Entry<String, Dictionary<String, Object>> entry : configMaps.entrySet()) {
- Configuration genConfig = configAdmin.getConfiguration(entry.getKey());
+ Configuration genConfig = configAdmin.getConfiguration(entry.getKey(), null);
genConfig.update(entry.getValue());
}
}
@@ -162,7 +162,7 @@ public class SecuredCommandConfigTransformer implements ConfigurationListener {
deleteServiceGuardConfig(event.getPid(), event.getPid().substring(PROXY_COMMAND_ACL_PID_PREFIX.length()));
break;
case ConfigurationEvent.CM_UPDATED:
- Configuration config = configAdmin.getConfiguration(event.getPid());
+ Configuration config = configAdmin.getConfiguration(event.getPid(), null);
generateServiceGuardConfig(config);
refreshTheAffectedShellCommandBundle(event, config);
break;