You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2021/02/22 11:23:24 UTC
[isis] branch master updated: ISIS-2538: supposedly fixes
compilation error (2)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 976fa38 ISIS-2538: supposedly fixes compilation error (2)
976fa38 is described below
commit 976fa38e903b9d05ca9e0b7b74f7625c03e1ce5b
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Feb 22 12:23:16 2021 +0100
ISIS-2538: supposedly fixes compilation error (2)
---
.../ui/components/widgets/linkandlabel/AjaxDeferredBehaviour.java | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/AjaxDeferredBehaviour.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/AjaxDeferredBehaviour.java
index f33bc75..8172ec2 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/AjaxDeferredBehaviour.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/AjaxDeferredBehaviour.java
@@ -28,6 +28,7 @@ import org.apache.wicket.util.time.Duration;
import org.apache.isis.applib.value.LocalResourcePath;
import org.apache.isis.core.metamodel.spec.ManagedObject;
+import org.apache.isis.core.metamodel.spec.ManagedObjects;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.viewer.wicket.model.models.ActionModel;
import org.apache.isis.viewer.wicket.ui.actionresponse.ActionResultResponseHandlingStrategy;
@@ -144,10 +145,7 @@ public abstract class AjaxDeferredBehaviour extends AbstractAjaxBehavior {
if(resultAdapter==null) {
resultAdapter = actionModel.execute();
}
- val value = resultAdapter!=null
- ? resultAdapter.getPojo()
- : (Object)null;
- return value;
+ return ManagedObjects.UnwrapUtil.single(resultAdapter);
}
protected void freeResultValue() {