From f693ca5be8d8d88ec73a4d544d030d63a75d31c9 Mon Sep 17 00:00:00 2001 From: Matija Obreza Date: Tue, 1 May 2018 10:13:13 +0200 Subject: [PATCH] Better handling of null origCty value --- .../geotools/service/impl/CountryOfOriginServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/genesys-geotools/src/main/java/org/genesys/geotools/service/impl/CountryOfOriginServiceImpl.java b/genesys-geotools/src/main/java/org/genesys/geotools/service/impl/CountryOfOriginServiceImpl.java index 9321079..eadb6ac 100644 --- a/genesys-geotools/src/main/java/org/genesys/geotools/service/impl/CountryOfOriginServiceImpl.java +++ b/genesys-geotools/src/main/java/org/genesys/geotools/service/impl/CountryOfOriginServiceImpl.java @@ -22,6 +22,7 @@ import java.net.MalformedURLException; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.StopWatch; import org.genesys.geotools.service.CountryOfOriginService; import org.genesys.geotools.service.LonLatCacheKey; @@ -204,7 +205,7 @@ public class CountryOfOriginServiceImpl implements CountryOfOriginService { LOG.debug("Processing time split: " + processingTime); } - if ((sb.length() == 0) || !sb.toString().contains(origCtyISO)) { + if ((sb.length() == 0) || StringUtils.trimToNull(origCtyISO) == null || !sb.toString().contains(origCtyISO)) { // if (sb.length() > 0) sb.append(", "); // sb.append("???"); // Filter filterBuffered = @@ -258,6 +259,7 @@ public class CountryOfOriginServiceImpl implements CountryOfOriginService { final Point point = geometryFactory.createPoint(coordinate); final Filter filterExact = ff.equal(ff.property("ISO3"), ff.literal(origCty), false); + LOG.trace("Distance of {} to {}", coordinate, origCty); try { final FeatureCollection matchingFeatures = sourceAdmin0.getFeatures(filterExact); -- GitLab