Avoid ApplicationSession.get() and always use the session from a wick…

…et page. Trying to fix #231
clarin-eric · Oct 31, 2024 · 41ac766 · 41ac766
1 parent 67912de
commit 41ac766
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/...java/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/BrowsePrivateCollectionsPage.java b/...java/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/BrowsePrivateCollectionsPage.java
@@ -13,7 +13,7 @@ public class BrowsePrivateCollectionsPage extends BasePage {
 
     public BrowsePrivateCollectionsPage() {
         final BrowseEditableCollectionsPanel pnl =
-                new BrowseEditableCollectionsPanel("collections", new PrivateCollectionsProvider(), getPageReference());
+                new BrowseEditableCollectionsPanel("collections", new PrivateCollectionsProvider(getSession()), getPageReference());
         pnl.setOutputMarkupId(true);
         add(pnl);
     }

diff --git a/...a/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/submission/MergeCollectionsPage.java b/...a/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/submission/MergeCollectionsPage.java
@@ -103,7 +103,7 @@ public MergeCollectionsPage(PageParameters params) throws VirtualCollectionRegis
             throw new RestartResponseException(ErrorPage.class);
         }
 
-        this.provider = new PrivateCollectionsProvider();
+        this.provider = new PrivateCollectionsProvider(getSession());
 
         addLabel(this, "heading_submitted_collection");
         addLabel(this, "heading_actions");

diff --git a/...n/java/eu/clarin/cmdi/virtualcollectionregistry/gui/table/PrivateCollectionsProvider.java b/...n/java/eu/clarin/cmdi/virtualcollectionregistry/gui/table/PrivateCollectionsProvider.java
@@ -11,9 +11,15 @@
 @SuppressWarnings("serial")
 public class PrivateCollectionsProvider extends CollectionsProvider {
 
+    private final ApplicationSession session;
+
+    public PrivateCollectionsProvider(final ApplicationSession session) {
+        this.session = session;
+    }
+
     @Override
     protected void addSpaceFilter(QueryOptions.Filter filter) {
-        ApplicationSession session = ApplicationSession.get();
+        //ApplicationSession session = ApplicationSession.get();
         filter.add(QueryOptions.Property.VC_OWNER,
                 QueryOptions.Relation.EQ,
                 session.getUser());