From 8793ab40ce61a5e4382d0175d28a8bf63f97825e Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Fri, 7 Feb 2020 11:35:18 +0100
Subject: [PATCH] BUG: wrong generation of host root with context root
---
src/main/java/caosdb/server/utils/WebinterfaceUtils.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/main/java/caosdb/server/utils/WebinterfaceUtils.java b/src/main/java/caosdb/server/utils/WebinterfaceUtils.java
index ecf0b086..2fef9eca 100644
--- a/src/main/java/caosdb/server/utils/WebinterfaceUtils.java
+++ b/src/main/java/caosdb/server/utils/WebinterfaceUtils.java
@@ -101,7 +101,8 @@ public class WebinterfaceUtils {
WebinterfaceUtils(
String host, String contextRoot, String publicDir, String route, String buildNumberFile) {
this.host = host;
- this.contextRoot = contextRoot;
+ this.contextRoot =
+ contextRoot != null ? contextRoot.replaceFirst("^/", "").replaceFirst("/$", "") : null;
this.publicDir = publicDir;
this.route = route;
this.buildNumberFile = getPublicRootPath().resolve(buildNumberFile);
--
GitLab