[Geotools-commits] svn - r38800 - in branches/2.7.x/modules/library/main/src: main/java/org/geotools/xml/transform test/java/org/geotools/xml

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

Author: dwins
Date: 2012-06-06 08:18:38 -0700 (Wed, 06 Jun 2012)
New Revision: 38800

Modified:
   branches/2.7.x/modules/library/main/src/main/java/org/geotools/xml/transform/TransformerBase.java
   branches/2.7.x/modules/library/main/src/test/java/org/geotools/xml/TransformerBaseTest.java
Log:
GEOT-4167 Avoid loss of diagnostic info when errors occur while using transactional XML encoding

Modified: branches/2.7.x/modules/library/main/src/main/java/org/geotools/xml/transform/TransformerBase.java
===================================================================
--- branches/2.7.x/modules/library/main/src/main/java/org/geotools/xml/transform/TransformerBase.java	2012-06-06 08:54:14 UTC (rev 38799)
+++ branches/2.7.x/modules/library/main/src/main/java/org/geotools/xml/transform/TransformerBase.java	2012-06-06 15:18:38 UTC (rev 38800)
@@ -467,6 +467,10 @@
             public void commit() {
                 _start(element, attributes);
             }
+
+            public String toString() {
+                return "Start(" + element + ", " + attributes + ")";
+            }
         }
 
         /**
@@ -483,6 +487,10 @@
             public void commit() {
                 _chars(text);
             }
+
+            public String toString() {
+                return "Chars(" + text + ")";
+            }
         }
 
         /**
@@ -499,6 +507,10 @@
             public void commit() {
                 _cdata(text);
             }
+
+            public String toString() {
+                return "CData(" + text + ")";
+            }
         }
 
         /**
@@ -515,6 +527,10 @@
             public void commit() {
                 _end(element);
             }
+            
+            public String toString() {
+                return "End(" + element + ")";
+            }
         }
 
         /**
@@ -532,18 +548,33 @@
          */
         private class BufferedBackend implements Backend {
             public void start(String element, Attributes attributes) {
+                if (element == null) {
+                    throw new NullPointerException("Attempted to start XML tag with null element");
+                }
+                if (attributes == null) {
+                    throw new NullPointerException("Attempted to start XML tag with null attributes");
+                }
                 pending.add(new Start(element, attributes));
             }
 
             public void chars(String text) {
+                if (text == null) {
+                    throw new NullPointerException("Attempted to start text block with null text");
+                }
                 pending.add(new Chars(text));
             }
             
             public void cdata(String text) {
+                if (text == null) {
+                    throw new NullPointerException("Attempted to start CDATA block with null text");
+                }
                 pending.add(new CData(text));
             }
             
             public void end(String element) {
+                if (element == null) {
+                    throw new NullPointerException("Attempted to close tag with null element");
+                }
                 pending.add(new End(element));
             }
         }
@@ -661,7 +692,13 @@
         protected void commit() {
             if (backend != bufferedBackend) throw new IllegalStateException("Can't commit without a mark");
             for (Action a : pending) {
-                a.commit();
+                try {
+                    a.commit();
+                } catch (Exception e) {
+                    String message =
+                        "Error while committing XML elements; specific element was: " + a;
+                    throw new RuntimeException(message, e);
+                }
             }
             pending.clear();
             backend = directBackend;

Modified: branches/2.7.x/modules/library/main/src/test/java/org/geotools/xml/TransformerBaseTest.java
===================================================================
--- branches/2.7.x/modules/library/main/src/test/java/org/geotools/xml/TransformerBaseTest.java	2012-06-06 08:54:14 UTC (rev 38799)
+++ branches/2.7.x/modules/library/main/src/test/java/org/geotools/xml/TransformerBaseTest.java	2012-06-06 15:18:38 UTC (rev 38800)
@@ -82,4 +82,15 @@
         String actual = tx.transform(10);
         assertEquals(expected, actual);
     }
+
+    public void testPassingInNull() throws FileNotFoundException, TransformerException {
+        ExampleTransformer tx = new ExampleTransformer(0, 0, true);
+        try {
+            tx.transform(null);
+            fail("Expected NullPointerException but none was thrown.");
+        } catch (TransformerException e) {
+            // Swallow exception IFF it was due to a NullPointerException; otherwise rethrow
+            if (!(e.getCause() instanceof NullPointerException)) throw e;
+        }
+    }
 }