You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@felix.apache.org by fm...@apache.org on 2009/01/18 14:11:37 UTC

svn commit: r735450 - /felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/ConfigManager.java

Author: fmeschbe
Date: Sun Jan 18 05:11:37 2009
New Revision: 735450

URL: http://svn.apache.org/viewvc?rev=735450&view=rev
Log:
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

Modified:
    felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/ConfigManager.java

Modified: felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/ConfigManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/ConfigManager.java?rev=735450&r1=735449&r2=735450&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/ConfigManager.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/ConfigManager.java Sun Jan 18 05:11:37 2009
@@ -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 );
         }