Repository: karaf Updated Branches: refs/heads/karaf-3.0.x 6c6a0a80a -> 25e3b585e
[KARAF-3204] Avoid calls to Configuration#setBundleLocation(null) which are not needed Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/25e3b585 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/25e3b585 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/25e3b585 Branch: refs/heads/karaf-3.0.x Commit: 25e3b585ecb8a2b8cf46be918c1de38d7b0bf674 Parents: 6c6a0a8 Author: Guillaume Nodet <gno...@gmail.com> Authored: Thu Sep 4 18:20:45 2014 +0200 Committer: Guillaume Nodet <gno...@gmail.com> Committed: Fri Sep 5 11:36:45 2014 +0200 ---------------------------------------------------------------------- .../org/apache/karaf/config/core/impl/ConfigRepositoryImpl.java | 3 --- .../apache/karaf/features/internal/FeatureConfigInstaller.java | 3 --- 2 files changed, 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/25e3b585/config/core/src/main/java/org/apache/karaf/config/core/impl/ConfigRepositoryImpl.java ---------------------------------------------------------------------- diff --git a/config/core/src/main/java/org/apache/karaf/config/core/impl/ConfigRepositoryImpl.java b/config/core/src/main/java/org/apache/karaf/config/core/impl/ConfigRepositoryImpl.java index 11bb720..4055cd9 100644 --- a/config/core/src/main/java/org/apache/karaf/config/core/impl/ConfigRepositoryImpl.java +++ b/config/core/src/main/java/org/apache/karaf/config/core/impl/ConfigRepositoryImpl.java @@ -42,9 +42,6 @@ public class ConfigRepositoryImpl implements ConfigRepository { @SuppressWarnings({ "rawtypes", "unchecked" }) public void update(String pid, Dictionary props) throws IOException { Configuration cfg = this.configAdmin.getConfiguration(pid, null); - if (cfg.getBundleLocation() != null) { - cfg.setBundleLocation(null); - } cfg.update(props); } http://git-wip-us.apache.org/repos/asf/karaf/blob/25e3b585/features/core/src/main/java/org/apache/karaf/features/internal/FeatureConfigInstaller.java ---------------------------------------------------------------------- diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/FeatureConfigInstaller.java b/features/core/src/main/java/org/apache/karaf/features/internal/FeatureConfigInstaller.java index 2e1b0c1..3d2309e 100644 --- a/features/core/src/main/java/org/apache/karaf/features/internal/FeatureConfigInstaller.java +++ b/features/core/src/main/java/org/apache/karaf/features/internal/FeatureConfigInstaller.java @@ -119,9 +119,6 @@ public class FeatureConfigInstaller { cfg = createConfiguration(configAdmin, pid[0], pid[1]); String key = createConfigurationKey(pid[0], pid[1]); cfgProps.put(CONFIG_KEY, key); - if (cfg.getBundleLocation() != null) { - cfg.setBundleLocation(null); - } cfg.update(cfgProps); } else if (config.isAppend()) { Dictionary<String,Object> properties = cfg.getProperties();
