(causeway) branch main updated: CAUSEWAY-3938: reverts prev. commit; uses less intrusive fix

[ahuber]

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

ahuber pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/causeway.git


The following commit(s) were added to refs/heads/main by this push:
     new bfec35bc58a CAUSEWAY-3938: reverts prev. commit; uses less intrusive 
fix
bfec35bc58a is described below

commit bfec35bc58a26a455fc315fcd764de1fb3ae007c
Author: Andi Huber <ahu...@apache.org>
AuthorDate: Tue Nov 4 09:01:54 2025 +0100

    CAUSEWAY-3938: reverts prev. commit; uses less intrusive fix
---
 .../apache/causeway/viewer/wicket/model/models/PropertyModel.java   | 5 -----
 .../causeway/viewer/wicket/model/models/SingleChoiceModel.java      | 6 ++++++
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git 
a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/PropertyModel.java
 
b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/PropertyModel.java
index cf2e15e7795..c9915b85fdf 100644
--- 
a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/PropertyModel.java
+++ 
b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/PropertyModel.java
@@ -112,9 +112,4 @@ protected Can<ObjectAction> calcAssociatedActions() {
         return getManagedProperty().getAssociatedActions();
     }
 
-    @Override
-    public void detach() {
-        uiProperty.detach();
-    }
-
 }
diff --git 
a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/SingleChoiceModel.java
 
b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/SingleChoiceModel.java
index d56b0e8ce9c..38387d0aceb 100644
--- 
a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/SingleChoiceModel.java
+++ 
b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/SingleChoiceModel.java
@@ -40,6 +40,12 @@ public record SingleChoiceModel(
 
     @Override
     public ObjectMemento getObject() {
+        if(pendingValue().getValue().getValue()==null) {
+            // trigger reinitialize
+            if(attributeModel instanceof PropertyModel propertyModel) {
+                propertyModel.getUiProperty().detach();
+            }
+        }
         return pendingValue().getValue().getValue().getMemento().orElseThrow();
     }