You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by gb...@apache.org on 2009/07/27 14:50:43 UTC

svn commit: r798117 - /incubator/pivot/trunk/core/src/org/apache/pivot/serialization/CSVSerializer.java

Author: gbrown
Date: Mon Jul 27 12:50:42 2009
New Revision: 798117

URL: http://svn.apache.org/viewvc?rev=798117&view=rev
Log:
Add parse error logging to CSVSerializer.

Modified:
    incubator/pivot/trunk/core/src/org/apache/pivot/serialization/CSVSerializer.java

Modified: incubator/pivot/trunk/core/src/org/apache/pivot/serialization/CSVSerializer.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/core/src/org/apache/pivot/serialization/CSVSerializer.java?rev=798117&r1=798116&r2=798117&view=diff
==============================================================================
--- incubator/pivot/trunk/core/src/org/apache/pivot/serialization/CSVSerializer.java (original)
+++ incubator/pivot/trunk/core/src/org/apache/pivot/serialization/CSVSerializer.java Mon Jul 27 12:50:42 2009
@@ -224,20 +224,31 @@
 
         lineNumberReader = new LineNumberReader(reader);
 
-        while (c != -1) {
-            Object item = readItem(lineNumberReader);
-            while (item != null) {
-                items.add(item);
-
-                // Move to next line
-                while (c != -1
-                    && (c == '\r' || c == '\n')) {
-                    c = lineNumberReader.read();
-                }
-
-                // Read the next item
-                item = readItem(lineNumberReader);
-            }
+        try {
+            while (c != -1) {
+                Object item = readItem(lineNumberReader);
+                while (item != null) {
+                    items.add(item);
+
+                    // Move to next line
+                    while (c != -1
+                        && (c == '\r' || c == '\n')) {
+                        c = lineNumberReader.read();
+                    }
+
+                    // Read the next item
+                    item = readItem(lineNumberReader);
+                }
+            }
+        } catch (IOException exception) {
+            logException(exception);
+            throw exception;
+        } catch (SerializationException exception) {
+            logException(exception);
+            throw exception;
+        } catch (RuntimeException exception) {
+            logException(exception);
+            throw exception;
         }
 
         lineNumberReader = null;
@@ -245,6 +256,10 @@
         return items;
     }
 
+    private void logException(Exception exception) {
+        System.err.println("An error occurred while processing input at line number " + getLineNumber());
+    }
+
     /**
      * Returns the line number currently being processed.
      *