# HG changeset patch # User vc11884admin@VC11884.win.bsh.de # Date 1309188172 -7200 # Node ID ad3f540fd1c3c004c354a8c3f889d0c7bcd7a8ee # Parent f98d2759e4944b7253f2cbbe7162a630751efd97# Parent 6d294beb0e59b1f2db981bfdd2eeb51a5db9f051 Merged. diff -r f98d2759e494 -r ad3f540fd1c3 ChangeLog --- a/ChangeLog Mon Jun 27 16:23:51 2011 +0200 +++ b/ChangeLog Mon Jun 27 17:22:52 2011 +0200 @@ -1,3 +1,8 @@ +2011-06-27 Raimund Renkert + + * src/java/de/intevation/mxd/writer/CartoLineSymbolReader.java: + Fixed exception handling for this reader. + 2011-06-27 Raimund Renkert * src/java/de/intevation/mxd/writer/MapScriptWriter.java: diff -r f98d2759e494 -r ad3f540fd1c3 src/java/de/intevation/mxd/reader/CartoLineSymbolReader.java --- a/src/java/de/intevation/mxd/reader/CartoLineSymbolReader.java Mon Jun 27 16:23:51 2011 +0200 +++ b/src/java/de/intevation/mxd/reader/CartoLineSymbolReader.java Mon Jun 27 17:22:52 2011 +0200 @@ -195,6 +195,9 @@ catch(IOException ioe){ logger.warn("Could not read pattern elements."); } + catch(NullPointerException npe) { + logger.debug("No pattern elements in carto line symbol"); + } symbolElement.setAttribute("type", "line"); symbolElement.setAttribute("style", "carto");