commit | fbeb58e0e9c7c3f49128808d3cd53133322d5283 | [log] [tgz] |
---|---|---|
author | Felix Meschberger <fmeschbe@apache.org> | Sun Jan 18 13:11:37 2009 +0000 |
committer | Felix Meschberger <fmeschbe@apache.org> | Sun Jan 18 13:11:37 2009 +0000 |
tree | 23a70a8fcc2b9a6cf93598bf089bac90c3429142 | |
parent | 792b98fc922e123096b8a5540746475604a4d5b4 [diff] |
FELIX-885 Only create a new factory configuration instance if the pid is null or the place holder PID, otherwise get the configuration with the pid git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@735450 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/ConfigManager.java b/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/ConfigManager.java index f20b81c..3e19140 100644 --- a/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/ConfigManager.java +++ b/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/ConfigManager.java
@@ -839,7 +839,7 @@ private Configuration getConfiguration( ConfigurationAdmin ca, String pid, String factoryPid ) throws IOException { - if ( factoryPid != null ) + if ( factoryPid != null && ( pid == null || pid.equals( PLACEHOLDER_PID ) ) ) { return ca.createFactoryConfiguration( factoryPid, null ); }