Merge "Issue #3099 - handle empty location name lists in the data request" into omaha_14.3.1

Former-commit-id: dba33e281e [formerly ba9ed2aba3] [formerly b7536a398b] [formerly dba33e281e [formerly ba9ed2aba3] [formerly b7536a398b] [formerly 96071c250d [formerly b7536a398b [formerly 1ccbd542f3a5025ba0e0c8d640170972823a583d]]]]
Former-commit-id: 96071c250d
Former-commit-id: c617423fd7 [formerly dbca36c2bc] [formerly 88095fd377297b348e1d0c64c9215b50da8eef27 [formerly 4c2923246a]]
Former-commit-id: f4c5590d3e741902d497b7b5cb7b21c8ccf1049b [formerly 704eff96aa]
Former-commit-id: 7c748842f0
This commit is contained in:
Nate Jensen 2014-05-01 12:40:41 -05:00 committed by Gerrit Code Review
commit b2b5727db3

View file

@ -66,6 +66,8 @@ import com.vividsolutions.jts.geom.Geometry;
* Jul 15, 2013 2184 dhladky Remove all HUC's for storage except ALL * 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 * Aug,20, 2013 2250 mnash Change some methods that were not working in all cases
* Jan,14, 2014 2667 mnash Remove getGridData method * 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.
* *
* </pre> * </pre>
* *
@ -219,7 +221,7 @@ public class FFMPGeometryFactory extends AbstractDataPluginFactory {
String[] locationNames = request.getLocationNames(); String[] locationNames = request.getLocationNames();
List<Long> pfafList = null; List<Long> pfafList = null;
if (locationNames != null) { if (locationNames != null && locationNames.length > 0) {
pfafList = convertLocations(locationNames); pfafList = convertLocations(locationNames);
} }