From 2ef70777b587c6042b5c6c709b5d6f5374e87860 Mon Sep 17 00:00:00 2001
From: Rick Herrick <jrherrick@wustl.edu>
Date: Thu, 25 Aug 2016 17:37:05 -0500
Subject: [PATCH] XNAT-1612 XNAT-4413 Added check for blank site URL preference
setting in addition to existing no-value check.
---
src/main/java/org/nrg/xapi/rest/settings/SiteConfigApi.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/org/nrg/xapi/rest/settings/SiteConfigApi.java b/src/main/java/org/nrg/xapi/rest/settings/SiteConfigApi.java
index f3d29c85..4b452e8f 100644
--- a/src/main/java/org/nrg/xapi/rest/settings/SiteConfigApi.java
+++ b/src/main/java/org/nrg/xapi/rest/settings/SiteConfigApi.java
@@ -118,7 +118,7 @@ public class SiteConfigApi extends AbstractXapiRestController {
if (_log.isInfoEnabled()) {
_log.info("The site is being initialized by user {}. Setting default values from context.", username);
}
- if (!preferences.containsKey("siteUrl")) {
+ if (!preferences.containsKey("siteUrl") || StringUtils.isBlank(preferences.get("siteUrl").toString())) {
preferences.put("siteUrl", XnatHttpUtils.getServerRoot(request));
}
}
--
GitLab