MID-7763 fixed regress with page session storage

(cherry picked from commit 310483d)
Evolveum · Mar 28, 2022 · 1b0f949 · 1b0f949
1 parent 8711d5e
commit 1b0f949
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/...mpl/page/admin/assignmentholder/component/assignmentType/AbstractAssignmentTypePanel.java b/...mpl/page/admin/assignmentholder/component/assignmentType/AbstractAssignmentTypePanel.java
@@ -6,10 +6,7 @@
  */
 package com.evolveum.midpoint.gui.impl.page.admin.assignmentholder.component.assignmentType;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
+import java.util.*;
 import javax.xml.namespace.QName;
 
 import org.apache.commons.collections4.CollectionUtils;
@@ -68,6 +65,7 @@
 import com.evolveum.midpoint.web.component.search.SearchItemDefinition;
 import com.evolveum.midpoint.web.component.util.AssignmentListProvider;
 import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;
+import com.evolveum.midpoint.web.session.GenericPageStorage;
 import com.evolveum.midpoint.web.session.PageStorage;
 import com.evolveum.midpoint.web.session.UserProfileStorage;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
@@ -162,6 +160,20 @@ public void onClick(AjaxRequestTarget target, IModel<PrismContainerValueWrapper<
         };
     }
 
+    @Override
+    protected PageStorage getPageStorage(String storageKey) {
+        Map<String, PageStorage> storage = getSession().getSessionStorage().getPageStorageMap();
+        PageStorage pageStorage = storage.get(storageKey);
+        if (pageStorage != null) {
+            return pageStorage;
+        }
+
+        pageStorage = new GenericPageStorage();
+        storage.put(storageKey, pageStorage);
+
+        return pageStorage;
+    }
+
     private String loadValuesForNameColumn(IModel<PrismContainerValueWrapper<AssignmentType>> rowModel, GuiObjectColumnType customColumn, ItemPath itemPath, ExpressionType expression) {
         if (expression != null || itemPath != null) {
             Collection<String> evaluatedValues = loadExportableColumnDataModel(rowModel, customColumn, itemPath, expression);

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/SessionStorage.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/SessionStorage.java
@@ -256,8 +256,6 @@ public PageStorage initPageStorage(String key) {
         } else if (KEY_AUDIT_LOG.equals(key)
                 || key.startsWith(KEY_OBJECT_HISTORY_AUDIT_LOG)) {
             pageStorage = new AuditLogStorage();
-        } else {
-            pageStorage = new GenericPageStorage();
         }
         if (pageStorage != null) {
             pageStorageMap.put(key, pageStorage);