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

[cz...@apache.org]

Author: cziegeler
Date: Tue Feb 10 08:45:05 2009
New Revision: 742891

URL: http://svn.apache.org/viewvc?rev=742891&view=rev
Log:
FELIX-933 : Allow direct display of config form even if no config is stored (throug meta type info)

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=742891&r1=742890&r2=742891&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 Tue Feb 10 08:45:05 2009
@@ -277,7 +277,7 @@
         pw.println( "</table>" );
 
         // if a configuration is addressed, display it immediately
-        Configuration config;
+        final Configuration config;
         if ( request.getParameter( "create" ) != null && pid != null )
         {
             config = new PlaceholderConfiguration( pid );
@@ -288,12 +288,12 @@
             config = getConfiguration( ca, pid );
         }
 
-        if ( config != null )
+        if ( pid != null )
         {
             Util.startScript( pw );
 
             pw.println( "var configuration=" );
-            printConfigurationJson( pw, config.getPid(), config, pidFilter, locale );
+            printConfigurationJson( pw, pid, config, pidFilter, locale );
             pw.println( ";" );
 
             pw.println( "displayConfigForm(configuration);" );