Repository: karaf Updated Branches: refs/heads/karaf-2.3.x 483bbfdc6 -> de9f72fbe
[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/de9f72fb Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/de9f72fb Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/de9f72fb Branch: refs/heads/karaf-2.3.x Commit: de9f72fbee34b03d44dfaeb2419d516dc0584396 Parents: 483bbfd 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:21:25 2014 +0200 ---------------------------------------------------------------------- .../org/apache/karaf/features/internal/FeaturesServiceImpl.java | 3 --- .../handler/EncryptableConfigAdminPropertyPlaceholderTest.java | 3 +-- .../karaf/management/mbeans/config/internal/ConfigMBeanImpl.java | 3 --- .../java/org/apache/karaf/shell/config/ConfigCommandSupport.java | 3 --- 4 files changed, 1 insertion(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/de9f72fb/features/core/src/main/java/org/apache/karaf/features/internal/FeaturesServiceImpl.java ---------------------------------------------------------------------- diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/FeaturesServiceImpl.java b/features/core/src/main/java/org/apache/karaf/features/internal/FeaturesServiceImpl.java index 3329a49..5efdcb2 100644 --- a/features/core/src/main/java/org/apache/karaf/features/internal/FeaturesServiceImpl.java +++ b/features/core/src/main/java/org/apache/karaf/features/internal/FeaturesServiceImpl.java @@ -609,9 +609,6 @@ public class FeaturesServiceImpl implements FeaturesService, FrameworkListener { cfg = createConfiguration(configAdmin, pid[0], pid[1]); String key = createConfigurationKey(pid[0], pid[1]); props.put(CONFIG_KEY, key); - if (cfg.getBundleLocation() != null) { - cfg.setBundleLocation(null); - } cfg.update(props); } } http://git-wip-us.apache.org/repos/asf/karaf/blob/de9f72fb/jaas/jasypt/src/test/java/org/apache/karaf/jaas/jasypt/handler/EncryptableConfigAdminPropertyPlaceholderTest.java ---------------------------------------------------------------------- diff --git a/jaas/jasypt/src/test/java/org/apache/karaf/jaas/jasypt/handler/EncryptableConfigAdminPropertyPlaceholderTest.java b/jaas/jasypt/src/test/java/org/apache/karaf/jaas/jasypt/handler/EncryptableConfigAdminPropertyPlaceholderTest.java index b8928e3..d0bc0a2 100644 --- a/jaas/jasypt/src/test/java/org/apache/karaf/jaas/jasypt/handler/EncryptableConfigAdminPropertyPlaceholderTest.java +++ b/jaas/jasypt/src/test/java/org/apache/karaf/jaas/jasypt/handler/EncryptableConfigAdminPropertyPlaceholderTest.java @@ -114,14 +114,13 @@ public class EncryptableConfigAdminPropertyPlaceholderTest extends TestCase { configAdmin = getOsgiService(ConfigurationAdmin.class); assertNotNull(configAdmin); - Configuration config = configAdmin.createFactoryConfiguration("encrypt.config"); + Configuration config = configAdmin.createFactoryConfiguration("encrypt.config", null); Dictionary props = new Properties(); // Encrypt a key/value // bar is encrypted and link to foo key encryptedValue = enc.encrypt("bar"); props.put("foo", encryptedValue); - config.setBundleLocation(null); config.update(props); Configuration[] configs = configAdmin.listConfigurations(null); http://git-wip-us.apache.org/repos/asf/karaf/blob/de9f72fb/management/mbeans/config/src/main/java/org/apache/karaf/management/mbeans/config/internal/ConfigMBeanImpl.java ---------------------------------------------------------------------- diff --git a/management/mbeans/config/src/main/java/org/apache/karaf/management/mbeans/config/internal/ConfigMBeanImpl.java b/management/mbeans/config/src/main/java/org/apache/karaf/management/mbeans/config/internal/ConfigMBeanImpl.java index 4433519..28a1694 100644 --- a/management/mbeans/config/src/main/java/org/apache/karaf/management/mbeans/config/internal/ConfigMBeanImpl.java +++ b/management/mbeans/config/src/main/java/org/apache/karaf/management/mbeans/config/internal/ConfigMBeanImpl.java @@ -260,9 +260,6 @@ public class ConfigMBeanImpl extends StandardMBean implements ConfigMBean { cfg = configurationAdmin.createFactoryConfiguration(pids[0], null); } } - if (cfg.getBundleLocation() != null) { - cfg.setBundleLocation(null); - } cfg.update(properties); } } http://git-wip-us.apache.org/repos/asf/karaf/blob/de9f72fb/shell/config/src/main/java/org/apache/karaf/shell/config/ConfigCommandSupport.java ---------------------------------------------------------------------- diff --git a/shell/config/src/main/java/org/apache/karaf/shell/config/ConfigCommandSupport.java b/shell/config/src/main/java/org/apache/karaf/shell/config/ConfigCommandSupport.java index 111bcf7..fdd078c 100644 --- a/shell/config/src/main/java/org/apache/karaf/shell/config/ConfigCommandSupport.java +++ b/shell/config/src/main/java/org/apache/karaf/shell/config/ConfigCommandSupport.java @@ -235,9 +235,6 @@ public abstract class ConfigCommandSupport extends OsgiCommandSupport { cfg = admin.createFactoryConfiguration(pids[0], null); } } - if (cfg.getBundleLocation() != null) { - cfg.setBundleLocation(null); - } cfg.update(props); }
