[felix-dev] branch master updated: FELIX-6629 Fix placeholder PID (#231)

[cziegeler]

This is an automated email from the ASF dual-hosted git repository.

cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git


The following commit(s) were added to refs/heads/master by this push:
     new bf3e009134 FELIX-6629 Fix placeholder PID (#231)
bf3e009134 is described below

commit bf3e00913466a305ce49a18e1e0620552bc51eb6
Author: Serge Huber <shu...@jahia.com>
AuthorDate: Wed Aug 23 14:56:29 2023 +0200

    FELIX-6629 Fix placeholder PID (#231)
    
    - Replace square brackets with underscore characters that will make this 
URL-compliant.
---
 .../internal/configuration/ConfigurationUtil.java          | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git 
a/webconsole/src/main/java/org/apache/felix/webconsole/internal/configuration/ConfigurationUtil.java
 
b/webconsole/src/main/java/org/apache/felix/webconsole/internal/configuration/ConfigurationUtil.java
index 0197ef31b0..d46b61a703 100644
--- 
a/webconsole/src/main/java/org/apache/felix/webconsole/internal/configuration/ConfigurationUtil.java
+++ 
b/webconsole/src/main/java/org/apache/felix/webconsole/internal/configuration/ConfigurationUtil.java
@@ -36,7 +36,7 @@ import org.osgi.service.cm.ConfigurationAdmin;
 
 public class ConfigurationUtil {
 
-    private static final String PLACEHOLDER_PID = "[Temporary PID replaced by 
real PID upon save]";
+    private static final String PLACEHOLDER_PID = "__Temporary PID replaced by 
real PID upon save__";
 
     public static Configuration findConfiguration( final ConfigurationAdmin 
service, final String pid ) {
         if ( pid != null ) {
@@ -59,9 +59,9 @@ public class ConfigurationUtil {
     }
 
 
-    public static Configuration getOrCreateConfiguration( final 
ConfigurationAdmin service, 
+    public static Configuration getOrCreateConfiguration( final 
ConfigurationAdmin service,
             final List<ConfigurationHandler> handlers,
-            final String pid, 
+            final String pid,
             final String factoryPid ) throws ValidationException, IOException {
         Configuration cfg = null;
         if ( !PLACEHOLDER_PID.equals(pid) ) {
@@ -76,7 +76,7 @@ public class ConfigurationUtil {
             } else {
                 for(final ConfigurationHandler handler : handlers) {
                     handler.createConfiguration(pid);
-                }        
+                }
                 cfg = service.getConfiguration( pid, null );
             }
         }
@@ -93,7 +93,7 @@ public class ConfigurationUtil {
         return true;
     }
 
- 
+
     public static Configuration getPlaceholderConfiguration( final String 
factoryPid ) {
         return new PlaceholderConfiguration( factoryPid );
     }
@@ -160,7 +160,7 @@ public class ConfigurationUtil {
         }
 
         @Override
-        public void addAttributes(ConfigurationAttribute... attrs) throws 
IOException {            
+        public void addAttributes(ConfigurationAttribute... attrs) throws 
IOException {
             // no attributes
         }
 
@@ -177,7 +177,7 @@ public class ConfigurationUtil {
         }
 
         @Override
-        public void removeAttributes(ConfigurationAttribute... attrs) throws 
IOException {            
+        public void removeAttributes(ConfigurationAttribute... attrs) throws 
IOException {
             // no attributes
         }