[Schmitzm-commits] r1722 - branches/2.6-KECK/schmitzm-gt/src/main/java/de/schmitzm/geotools/styling

[scm-commit@wald.intevation.org]

Author: alfonx
Date: 2011-09-07 11:26:49 +0200 (Wed, 07 Sep 2011)
New Revision: 1722

Modified:
   branches/2.6-KECK/schmitzm-gt/src/main/java/de/schmitzm/geotools/styling/StylingUtil.java
Log:
Avoid NPE in StylingUtil.optimizeStyle if filter is null

Modified: branches/2.6-KECK/schmitzm-gt/src/main/java/de/schmitzm/geotools/styling/StylingUtil.java
===================================================================
--- branches/2.6-KECK/schmitzm-gt/src/main/java/de/schmitzm/geotools/styling/StylingUtil.java	2011-09-07 09:25:41 UTC (rev 1721)
+++ branches/2.6-KECK/schmitzm-gt/src/main/java/de/schmitzm/geotools/styling/StylingUtil.java	2011-09-07 09:26:49 UTC (rev 1722)
@@ -3050,6 +3050,9 @@
 	 *         AtlasStyler.
 	 */
 	public static Filter simpliyfyFilter(Filter f) {
+
+		if (f == null) return Filter.INCLUDE; 
+
 		if (f instanceof AndImpl) {
 			AndImpl and = (AndImpl) f;
 			Filter p1 = (Filter) and.getChildren().get(0);