Fix XWIKI-22547 with ShortURL exception

xwiki · Oct 5, 2024 · 5ced79e · 5ced79e
1 parent 379064c
commit 5ced79e
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/...i-platform-websocket/src/main/java/org/xwiki/websocket/script/WebSocketScriptService.java b/...i-platform-websocket/src/main/java/org/xwiki/websocket/script/WebSocketScriptService.java
@@ -84,9 +84,10 @@ public String url(String pathOrRoleHint)
             XWikiContext xcontext = this.xcontextProvider.get();
 
             StringBuilder path = new StringBuilder("/");
-            path.append(xcontext.getWiki().getWebAppPath(xcontext));
+            if (!xcontext.getWiki().getWebAppPath(xcontext).equals('/')) {
+                path.append(xcontext.getWiki().getWebAppPath(xcontext));
+            }
             path.append("websocket").append(path(pathOrRoleHint));
-
             URL serverURL = xcontext.getURLFactory().getServerURL(xcontext);
             String scheme = "https".equals(serverURL.getProtocol()) ? "wss" : "ws";
             // We have to add the path afterwards because the URI constructor double encodes it.