From 4775dc1f40721bbc7eb46fc715f57974dfd782dd Mon Sep 17 00:00:00 2001 From: Bryan Kowal Date: Thu, 1 May 2014 12:12:02 -0500 Subject: [PATCH] Issue #3099 - handle empty location name lists in the data request Former-commit-id: ff21ef813c8af800af3f975533fdf990f374c11a [formerly 5eac78f0e08e0c682c0271a75355180ba4a71b51] [formerly a9b9a8b8c4778b5eb94187876ed255be4f6fd0c0 [formerly 79603ec579d6ebcd1ef707f637e1b207ae18f803]] Former-commit-id: a9b9a8b8c4778b5eb94187876ed255be4f6fd0c0 Former-commit-id: 2079aec2bb83b151faa69179362a1281fc8292e3 --- .../dataplugin/ffmp/dataaccess/FFMPGeometryFactory.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/dataaccess/FFMPGeometryFactory.java b/edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/dataaccess/FFMPGeometryFactory.java index 9618dfee52..51862f783c 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/dataaccess/FFMPGeometryFactory.java +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/dataaccess/FFMPGeometryFactory.java @@ -66,6 +66,8 @@ import com.vividsolutions.jts.geom.Geometry; * Jul 15, 2013 2184 dhladky Remove all HUC's for storage except ALL * Aug,20, 2013 2250 mnash Change some methods that were not working in all cases * Jan,14, 2014 2667 mnash Remove getGridData method + * May 1, 2014 3099 bkowal No longer use an empty pfaf list when the + * data request locationNames list is empty. * * * @@ -219,7 +221,7 @@ public class FFMPGeometryFactory extends AbstractDataPluginFactory { String[] locationNames = request.getLocationNames(); List pfafList = null; - if (locationNames != null) { + if (locationNames != null && locationNames.length > 0) { pfafList = convertLocations(locationNames); }