[felix-dev] branch master updated: FELIX-6367 : Provide SPI for configuration management (WiP)

[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 92f677b   FELIX-6367 : Provide SPI for configuration management (WiP)
92f677b is described below

commit 92f677b0939ad5303a84c9053a582215bfb0f60e
Author: Carsten Ziegeler <cziege...@apache.org>
AuthorDate: Mon Aug 30 15:01:20 2021 +0200

     FELIX-6367 : Provide SPI for configuration management (WiP)
---
 .../webconsole/internal/configuration/ConfigAdminSupport.java  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git 
a/webconsole/src/main/java/org/apache/felix/webconsole/internal/configuration/ConfigAdminSupport.java
 
b/webconsole/src/main/java/org/apache/felix/webconsole/internal/configuration/ConfigAdminSupport.java
index c0f769d..40c002e 100644
--- 
a/webconsole/src/main/java/org/apache/felix/webconsole/internal/configuration/ConfigAdminSupport.java
+++ 
b/webconsole/src/main/java/org/apache/felix/webconsole/internal/configuration/ConfigAdminSupport.java
@@ -93,7 +93,7 @@ class ConfigAdminSupport {
 
     boolean shouldSet(final PropertyDescriptor ad, final String value, final 
boolean isUpdate) 
     {
-        if ( ad.hasMetatype() && !isUpdate )
+        if ( this.configurationHandlers.isEmpty() && ad.hasMetatype() && 
!isUpdate )
         {
             if ( value.isEmpty() && ad.getDefaultValue() == null )
             {
@@ -109,7 +109,7 @@ class ConfigAdminSupport {
 
     boolean shouldSet(final PropertyDescriptor ad, final String[] values, 
final boolean isUpdate) 
     {
-        if ( ad.hasMetatype() && !isUpdate )
+        if ( this.configurationHandlers.isEmpty() && ad.hasMetatype() && 
!isUpdate )
         {
             if ( ad.getDefaultValue() == null )
             {
@@ -173,7 +173,7 @@ class ConfigAdminSupport {
                 if ( value != null
                     && ( attributeType != AttributeDefinition.PASSWORD || 
!MetaTypeSupport.PASSWORD_PLACEHOLDER_VALUE.equals( value ) ) )
                 {
-                    if ( this.configurationHandlers.isEmpty() && shouldSet(ad, 
value, isUpdate) ) 
+                    if ( shouldSet(ad, value, isUpdate) ) 
                     {
                         props.put( propName, value );
                     }
@@ -189,7 +189,7 @@ class ConfigAdminSupport {
                 final String value = request.getParameter( paramName );
                 if ( value != null )
                 {
-                    if ( this.configurationHandlers.isEmpty() && shouldSet(ad, 
value, isUpdate) ) 
+                    if ( shouldSet(ad, value, isUpdate) ) 
                     {
                         try
                         {
@@ -264,7 +264,7 @@ class ConfigAdminSupport {
                     valueArray[i] = vec.get(i).toString();
                 }
                 
-                final boolean shouldSet = this.configurationHandlers.isEmpty() 
&& shouldSet(ad, valueArray, isUpdate);
+                final boolean shouldSet = shouldSet(ad, valueArray, isUpdate);
 
                 if ( ad.getCardinality() < 0 )
                 {