You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@clerezza.apache.org by ds...@apache.org on 2011/10/26 17:31:01 UTC
svn commit: r1189268 - in
/incubator/clerezza/trunk/parent/rdf.rdfjson/src/main/java/org/apache/clerezza/rdf/rdfjson:
parser/RdfJsonParsingProvider.java serializer/RdfJsonSerializingProvider.java
Author: dspicar
Date: Wed Oct 26 15:31:01 2011
New Revision: 1189268
URL: http://svn.apache.org/viewvc?rev=1189268&view=rev
Log:
CLEREZZA-643: applied partial patch by Rupert Westenthaler: changed RDF-JSON Serializer/Parser to write/read UTF-8 encoded bytes instead of platform default encoding.
Modified:
incubator/clerezza/trunk/parent/rdf.rdfjson/src/main/java/org/apache/clerezza/rdf/rdfjson/parser/RdfJsonParsingProvider.java
incubator/clerezza/trunk/parent/rdf.rdfjson/src/main/java/org/apache/clerezza/rdf/rdfjson/serializer/RdfJsonSerializingProvider.java
Modified: incubator/clerezza/trunk/parent/rdf.rdfjson/src/main/java/org/apache/clerezza/rdf/rdfjson/parser/RdfJsonParsingProvider.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/rdf.rdfjson/src/main/java/org/apache/clerezza/rdf/rdfjson/parser/RdfJsonParsingProvider.java?rev=1189268&r1=1189267&r2=1189268&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/rdf.rdfjson/src/main/java/org/apache/clerezza/rdf/rdfjson/parser/RdfJsonParsingProvider.java (original)
+++ incubator/clerezza/trunk/parent/rdf.rdfjson/src/main/java/org/apache/clerezza/rdf/rdfjson/parser/RdfJsonParsingProvider.java Wed Oct 26 15:31:01 2011
@@ -19,6 +19,7 @@ package org.apache.clerezza.rdf.rdfjson.
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
+import java.io.UnsupportedEncodingException;
import java.util.HashMap;
import java.util.Map;
import org.json.simple.JSONArray;
@@ -59,7 +60,14 @@ public class RdfJsonParsingProvider impl
BNodeManager bNodeMgr = new BNodeManager();
JSONParser parser = new JSONParser();
- InputStreamReader reader = new InputStreamReader(serializedGraph);
+ InputStreamReader reader;
+ try {
+ reader = new InputStreamReader(serializedGraph, "UTF-8");
+ } catch (UnsupportedEncodingException e) {
+ String msg = "Encoding 'UTF-8' is not supported by this System";
+ logger.error("{} (message: {})", msg, e.getMessage());
+ throw new IllegalStateException(msg, e);
+ }
try {
JSONObject root = (JSONObject) parser.parse(reader);
Modified: incubator/clerezza/trunk/parent/rdf.rdfjson/src/main/java/org/apache/clerezza/rdf/rdfjson/serializer/RdfJsonSerializingProvider.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/rdf.rdfjson/src/main/java/org/apache/clerezza/rdf/rdfjson/serializer/RdfJsonSerializingProvider.java?rev=1189268&r1=1189267&r2=1189268&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/rdf.rdfjson/src/main/java/org/apache/clerezza/rdf/rdfjson/serializer/RdfJsonSerializingProvider.java (original)
+++ incubator/clerezza/trunk/parent/rdf.rdfjson/src/main/java/org/apache/clerezza/rdf/rdfjson/serializer/RdfJsonSerializingProvider.java Wed Oct 26 15:31:01 2011
@@ -82,7 +82,7 @@ public class RdfJsonSerializingProvider
}
}
try {
- serializedGraph.write(root.toJSONString().getBytes());
+ serializedGraph.write(root.toJSONString().getBytes("UTF-8"));
} catch (IOException ioe) {
logger.error(ioe.getMessage());
throw new RuntimeException(ioe.getMessage());