[PATCH] Do not NPE if there is a folder without mapfiles in the shapefile path

Wald Commits scm-commit at wald.intevation.org
Thu Dec 5 19:38:02 CET 2013


# HG changeset patch
# User Andre Heinecke <aheinecke at intevation.de>
# Date 1386268679 -3600
# Node ID 81ae2a4873f228ea893fc8a42fb782026a0749e9
# Parent  197bd0958cba3bb7b00d9d09e17da46fde36d066
Do not NPE if there is a folder without mapfiles in the shapefile path

diff -r 197bd0958cba -r 81ae2a4873f2 artifacts/src/main/java/org/dive4elements/river/utils/MapfileGenerator.java
--- a/artifacts/src/main/java/org/dive4elements/river/utils/MapfileGenerator.java	Thu Dec 05 19:29:52 2013 +0100
+++ b/artifacts/src/main/java/org/dive4elements/river/utils/MapfileGenerator.java	Thu Dec 05 19:37:59 2013 +0100
@@ -259,6 +259,10 @@
                 }
             });
 
+            if (layerFiles == null) {
+                continue;
+            }
+
             for (File layer: layerFiles) {
                 try {
                     layers.add(layer.getCanonicalPath());


More information about the Dive4elements-commits mailing list