[DURACOM-288] Change logic in order to use dspaceUrl as default fallback

4Science · Feb 3, 2025 · c9332c2 · c9332c2
1 parent 855dfc3
commit c9332c2
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/RootConverter.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/RootConverter.java
@@ -31,10 +31,10 @@ public RootRest convert(HttpServletRequest request) {
         String requestUrl = request.getRequestURL().toString();
         String dspaceUrl = configurationService.getProperty("dspace.server.url");
         String dspaceSSRUrl = configurationService.getProperty("dspace.server.ssr.url", dspaceUrl);
-        if (dspaceUrl.equals(dspaceSSRUrl) || requestUrl.startsWith(dspaceUrl)) {
-            rootRest.setDspaceServer(dspaceUrl);
-        } else {
+        if (!dspaceUrl.equals(dspaceSSRUrl) && requestUrl.startsWith(dspaceSSRUrl)) {
             rootRest.setDspaceServer(dspaceSSRUrl);
+        } else {
+            rootRest.setDspaceServer(dspaceUrl);
         }
         rootRest.setDspaceVersion("DSpace " + getSourceVersion());
         return rootRest;