From d84cfefa4f2e1b653ce6bb659d7a3e38340d74ea Mon Sep 17 00:00:00 2001
From: "francesco.mangiacrapa" <francesco.mangiacrapa@isti.cnr.it>
Date: Thu, 24 Oct 2019 15:22:32 +0000
Subject: [PATCH] Bug fixing
 https://support.d4science.org/issues/17831#change-92733 Updated pom version
 at 1.1.2

git-svn-id: https://svn.research-infrastructures.eu/d4science/gcube/trunk/spatial-data/geo-utility@182116 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 distro/changelog.xml                          | 19 ++++++++------
 pom.xml                                       |  2 +-
 .../data/geoutility/wms/WmsUrlValidator.java  | 17 +++++++++----
 target/profile.xml                            | 25 +++++++++++++++++++
 4 files changed, 50 insertions(+), 13 deletions(-)
 create mode 100644 target/profile.xml

diff --git a/distro/changelog.xml b/distro/changelog.xml
index 36ccc50..4aa4ace 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,16 +1,21 @@
 <ReleaseNotes>
-	<Changeset component="org.gcube.spatial-data.geo-utility.1-1-1"
-		date="2016-04-27">
+	<Changeset
+		component="org.gcube.spatial-data.geo-utility.1-1-2" date="2019-10-24">
+		<Change>Bug fixing https://support.d4science.org/issues/17831#change-92733</Change>
+	</Changeset>
+	<Changeset
+		component="org.gcube.spatial-data.geo-utility.1-1-1" date="2016-04-27">
 		<Change>Updated comment in WMSGetStyles class</Change>
 		<Change>Bug fixing for method getValueOfParameter</Change>
 	</Changeset>
-	<Changeset component="org.gcube.spatial-data.geo-utility.1-1-0"
-		date="2016-02-09">
+	<Changeset
+		component="org.gcube.spatial-data.geo-utility.1-1-0" date="2016-02-09">
 		<Change>[Feature #2191] Updated NcWmsGetMetadata to retrieve z-axis
-			property</Change>
+			property
+		</Change>
 	</Changeset>
-	<Changeset component="org.gcube.spatial-data.geo-utility.1-0-0"
-		date="2016-01-26">
+	<Changeset
+		component="org.gcube.spatial-data.geo-utility.1-0-0" date="2016-01-26">
 		<Change>[Feature #2054] First Release</Change>
 	</Changeset>
 </ReleaseNotes>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 968251f..1dedd1e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
 	<groupId>org.gcube.spatial.data</groupId>
 	<artifactId>geo-utility</artifactId>
 	<packaging>jar</packaging>
-	<version>1.1.1-SNAPSHOT</version>
+	<version>1.1.2-SNAPSHOT</version>
 	<name>geo-utility</name>
 	<description>A library with several utility classes to work with geo-spatial data: WmsUrlValidator, GeoGetStyles, etc..</description>
 
diff --git a/src/main/java/org/gcube/spatial/data/geoutility/wms/WmsUrlValidator.java b/src/main/java/org/gcube/spatial/data/geoutility/wms/WmsUrlValidator.java
index f71ef24..2f844ab 100644
--- a/src/main/java/org/gcube/spatial/data/geoutility/wms/WmsUrlValidator.java
+++ b/src/main/java/org/gcube/spatial/data/geoutility/wms/WmsUrlValidator.java
@@ -1,6 +1,7 @@
 package org.gcube.spatial.data.geoutility.wms;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -34,6 +35,7 @@ public class WmsUrlValidator {
 	 */
 	public WmsUrlValidator(String wmsRequest){
 		this.wmsRequest = wmsRequest;
+		logger.debug("The wms request is: "+wmsRequest);
 		int indexStart = wmsRequest.indexOf("?");
 		if(indexStart==-1){
 			this.baseWmsServiceUrl = wmsRequest;
@@ -127,11 +129,16 @@ public class WmsUrlValidator {
 		//CREATING MAP TO RETURN WMS PARAMETERS NOT STANDARD
 		mapWmsNoStandardParams = new TreeMap<String, String>(String.CASE_INSENSITIVE_ORDER);
 
-		for (String param : params) {
-			int ei = param.indexOf("=");
-			String key = param.substring(0, ei);
-			String value = param.substring(ei+1, param.length());
-			mapWmsNoStandardParams.put(key, value);
+		if(params.length>0) {
+			logger.debug("Params are: "+Arrays.asList(params));
+			for (String param : params) {
+				if(param!=null && !param.isEmpty()) {
+					int ei = param.indexOf("=");
+					String key = param.substring(0, ei);
+					String value = param.substring(ei+1, param.length());
+					mapWmsNoStandardParams.put(key, value);
+				}
+			}
 		}
 
 		//CREATE WMS REQUEST
diff --git a/target/profile.xml b/target/profile.xml
new file mode 100644
index 0000000..c46436c
--- /dev/null
+++ b/target/profile.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<ID></ID>
+	<Type>Library</Type>
+	<Profile>
+		<Description>{description}</Description>
+		<Class>SpatialData</Class>
+		<Name>geo-utility</Name>
+		<Version>1.0.0</Version>
+		<Packages>
+			<Software>
+				<Name>geo-utility</Name>
+				<Version>1.1.1-SNAPSHOT</Version>
+				<MavenCoordinates>
+					<groupId>org.gcube.spatial.data</groupId>
+					<artifactId>geo-utility</artifactId>
+					<version>1.1.1-SNAPSHOT</version>
+				</MavenCoordinates>
+				<Files>
+					<File>geo-utility-1.1.1-SNAPSHOT.jar</File>
+				</Files>
+			</Software>
+		</Packages>
+	</Profile>
+</Resource>