Merge branch 'w2p-119664_Statistics-scope-fix-7.6' into w2p-119664_St…

…atistics-scope-fix-main
atmire · Dec 2, 2024 · 1eed688 · 1eed688
2 parents fc544a8 + 48956d9
commit 1eed688
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/SearchEventConverter.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/SearchEventConverter.java
@@ -67,8 +67,8 @@ public UsageSearchEvent convert(Context context, HttpServletRequest request, Sea
         if (searchEventRest.getScope() != null) {
             IndexableObject scopeObject =
                     scopeResolver.resolveScope(context, String.valueOf(searchEventRest.getScope()));
-            if (scopeObject instanceof DSpaceObject) {
-                usageSearchEvent.setScope((DSpaceObject) scopeObject);
+            if (scopeObject != null && scopeObject.getIndexedObject() instanceof DSpaceObject) {
+                usageSearchEvent.setScope((DSpaceObject) scopeObject.getIndexedObject());
             }
         }
         usageSearchEvent.setConfiguration(searchEventRest.getConfiguration());