svn commit: r885452 - /incubator/cassandra/trunk/src/java/org/apache/cassandra/tools/SSTableImport.java

[eevans]

Author: eevans
Date: Mon Nov 30 15:25:59 2009
New Revision: 885452

URL: http://svn.apache.org/viewvc?rev=885452&view=rev
Log:
use json-simple method that propagates exceptions

Modified:
    
incubator/cassandra/trunk/src/java/org/apache/cassandra/tools/SSTableImport.java

Modified: 
incubator/cassandra/trunk/src/java/org/apache/cassandra/tools/SSTableImport.java
URL: 
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/tools/SSTableImport.java?rev=885452&r1=885451&r2=885452&view=diff
==============================================================================
--- 
incubator/cassandra/trunk/src/java/org/apache/cassandra/tools/SSTableImport.java
 (original)
+++ 
incubator/cassandra/trunk/src/java/org/apache/cassandra/tools/SSTableImport.java
 Mon Nov 30 15:25:59 2009
@@ -139,11 +139,7 @@
         
         try
         {
-            JSONObject json = (JSONObject)JSONValue.parse(new 
FileReader(jsonFile));
-            
-            // FIXME: see 
http://code.google.com/p/json-simple/issues/detail?id=13
-            if (json == null)
-                throw new RuntimeException("Error parsing JSON input!");
+            JSONObject json = (JSONObject)JSONValue.parseWithException(new 
FileReader(jsonFile));
             
             SSTableWriter writer = new SSTableWriter(ssTablePath, json.size(), 
partitioner);
             List<DecoratedKey<?>> decoratedKeys = new 
ArrayList<DecoratedKey<?>>();