changeset 2296:d69d8dea78dc

Be more merciful for building the URL for the user-wms. flys-artifacts/trunk@3962 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Ingo Weinzierl <ingo.weinzierl@intevation.de>
date Wed, 08 Feb 2012 10:54:23 +0000
parents 504f53de1581
children c7bbd4e582ed
files flys-artifacts/ChangeLog flys-artifacts/src/main/java/de/intevation/flys/utils/FLYSUtils.java
diffstat 2 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog	Wed Feb 08 10:26:21 2012 +0000
+++ b/flys-artifacts/ChangeLog	Wed Feb 08 10:54:23 2012 +0000
@@ -1,3 +1,9 @@
+2012-02-08  Ingo Weinzierl <ingo@intevation.de>
+
+	* src/main/java/de/intevation/flys/utils/FLYSUtils.java: Add a "/" to the
+	  URL of the user wms if the URL configured in conf.xml doesn't end with
+	  a "/".
+
 2012-02-08  Felix Wolfsteller	<felix.wolfsteller@intevation.de>
 
 	Fix flys/issue472.
--- a/flys-artifacts/src/main/java/de/intevation/flys/utils/FLYSUtils.java	Wed Feb 08 10:26:21 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/utils/FLYSUtils.java	Wed Feb 08 10:54:23 2012 +0000
@@ -639,7 +639,7 @@
      */
     public static String getUserWMSUrl(String artifactId) {
         String url = getXPathString(XPATH_MAPSERVER_URL);
-        url = url + "user-wms";
+        url = url.endsWith("/") ? url + "user-wms" : url + "/" + "user-wms";
 
         return url;
     }

http://dive4elements.wald.intevation.org