Merge branches 'master' and 'master' of github.com:Evolveum/midpoint

* 'master' of github.com:Evolveum/midpoint: base sortable provider, improved detaching (available data cleared on detach) * 'master' of github.com:Evolveum/midpoint: base sortable provider, improved detaching (available data cleared on detach)
Evolveum · Aug 29, 2023 · e1795fe · e1795fe
2 parents 9a5a92d + 8480057
commit e1795fe
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/...java/com/evolveum/midpoint/gui/impl/component/data/provider/BaseSortableDataProvider.java b/...java/com/evolveum/midpoint/gui/impl/component/data/provider/BaseSortableDataProvider.java
@@ -376,4 +376,13 @@ public void setExportSize(boolean exportSize) {
     public boolean isUseCache() {
         return useCache;
     }
+
+    @Override
+    public void detach() {
+        super.detach();
+
+        if (availableData != null) {
+            availableData.clear();
+        }
+    }
 }
diff --git a/...rc/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/RoleCatalogPanel.java b/...rc/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/RoleCatalogPanel.java
@@ -11,7 +11,6 @@
 import java.util.stream.Collectors;
 import javax.xml.namespace.QName;
 
-import com.evolveum.midpoint.gui.impl.util.IconAndStylesUtil;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -56,6 +55,7 @@
 import com.evolveum.midpoint.gui.impl.component.search.panel.SearchPanel;
 import com.evolveum.midpoint.gui.impl.component.tile.*;
 import com.evolveum.midpoint.gui.impl.page.self.PageRequestAccess;
+import com.evolveum.midpoint.gui.impl.util.IconAndStylesUtil;
 import com.evolveum.midpoint.prism.PrismContext;
 import com.evolveum.midpoint.prism.PrismObject;
 import com.evolveum.midpoint.prism.path.ItemPath;