From 4b0c9ef55192f76ab3c052d76be6cea65ee1c69e Mon Sep 17 00:00:00 2001 From: Michal Petrov Date: Tue, 17 Mar 2026 19:04:12 +0100 Subject: [PATCH] HAL-2054: fix properties processing --- .../configuration/subsystem/undertow/ServletContainerView.java | 2 +- .../src/main/java/org/jboss/hal/core/PropertiesOperations.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/jboss/hal/client/configuration/subsystem/undertow/ServletContainerView.java b/app/src/main/java/org/jboss/hal/client/configuration/subsystem/undertow/ServletContainerView.java index c8ae2c6272..3bf8d929f6 100644 --- a/app/src/main/java/org/jboss/hal/client/configuration/subsystem/undertow/ServletContainerView.java +++ b/app/src/main/java/org/jboss/hal/client/configuration/subsystem/undertow/ServletContainerView.java @@ -108,7 +108,7 @@ public ServletContainerView(Dispatcher dispatcher, welcomeFileForm = new ModelNodeForm.Builder<>(Ids.UNDERTOW_SERVLET_CONTAINER_WELCOME_FILE_FORM, emptyMetadata) .unboundFormItem(welcomeFileItem, 0, SafeHtmlUtils.fromString(welcomeFileDescription.asString())) .onSave((form, changedValues) -> presenter.saveWelcomeFile(welcomeFileItem.getValue().stream() - .collect(toMap(Function.identity(), value -> null)))) + .collect(toMap(Function.identity(), value -> "")))) .prepareReset(form -> presenter.resetWelcomeFile(form)) .build(); diff --git a/core/src/main/java/org/jboss/hal/core/PropertiesOperations.java b/core/src/main/java/org/jboss/hal/core/PropertiesOperations.java index 34804ea510..bbddb5900f 100644 --- a/core/src/main/java/org/jboss/hal/core/PropertiesOperations.java +++ b/core/src/main/java/org/jboss/hal/core/PropertiesOperations.java @@ -45,6 +45,7 @@ import org.jboss.hal.spi.Message; import org.jboss.hal.spi.MessageEvent; +import com.google.common.base.Strings; import com.google.common.collect.Sets; import com.google.web.bindery.event.shared.EventBus; @@ -308,7 +309,7 @@ public Promise apply(final FlowContext context) { .map(property -> { ResourceAddress address = new ResourceAddress(this.address).add(propertiesResource, property); Operation.Builder builder = new Operation.Builder(address, ADD); - if (properties.get(property) != null) { + if (!Strings.isNullOrEmpty(properties.get(property))) { builder.param(VALUE, properties.get(property)); } return builder.build();