[isis] branch master updated: ISIS-2882: fixes NPE on de-serialization of IsisToWicketTreeAdapter

[ah...@apache.org]

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 b60ab14  ISIS-2882: fixes NPE on de-serialization of IsisToWicketTreeAdapter
b60ab14 is described below

commit b60ab14d660455873268dc84c30707c432c6a0fc
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Dec 10 20:53:50 2021 +0100

    ISIS-2882: fixes NPE on de-serialization of IsisToWicketTreeAdapter
---
 .../viewer/wicket/ui/components/tree/IsisToWicketTreeAdapter.java     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/IsisToWicketTreeAdapter.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/IsisToWicketTreeAdapter.java
index de4c749..1d7753a 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/IsisToWicketTreeAdapter.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/IsisToWicketTreeAdapter.java
@@ -402,7 +402,7 @@ class IsisToWicketTreeAdapter {
         private final TreePath treePath;
         private final int hashCode;
 
-        private final transient IsisAppCommonContext commonContext;
+        private transient IsisAppCommonContext commonContext;
 
         public LoadableDetachableTreeModel(final TreeModel tModel) {
             super(tModel);
@@ -419,6 +419,8 @@ class IsisToWicketTreeAdapter {
         @Override
         protected TreeModel load() {
 
+            commonContext = CommonContextUtils.computeIfAbsent(commonContext);
+
             val oid = bookmark;
             val objAdapter = commonContext.getMetaModelContext()
                     .loadObject(oid)