[Geotools-commits] svn - r38796 - branches/2.7.x/modules/library/xml/src/main/java/org/geotools/xml

[<svn...@os...>]

Author: aaime
Date: 2012-06-02 01:23:48 -0700 (Sat, 02 Jun 2012)
New Revision: 38796

Modified:
   branches/2.7.x/modules/library/xml/src/main/java/org/geotools/xml/XMLSAXHandler.java
Log:
Prevent NPE when we have an error but the locator is null (happens when we have invalid charset declaration in the xml

Modified: branches/2.7.x/modules/library/xml/src/main/java/org/geotools/xml/XMLSAXHandler.java
===================================================================
--- branches/2.7.x/modules/library/xml/src/main/java/org/geotools/xml/XMLSAXHandler.java	2012-06-01 16:39:50 UTC (rev 38795)
+++ branches/2.7.x/modules/library/xml/src/main/java/org/geotools/xml/XMLSAXHandler.java	2012-06-02 08:23:48 UTC (rev 38796)
@@ -485,8 +485,10 @@
     public void fatalError(SAXParseException exception)
         throws SAXException {
         logger.severe("FATAL " + exception.getMessage());
-        logger.severe("col " + locator.getColumnNumber() + ", line "
-            + locator.getLineNumber());
+        if(locator != null) {
+            logger.severe("col " + locator.getColumnNumber() + ", line "
+                + locator.getLineNumber());
+        }
         throw exception;
     }