Bug #508900 - JsonStructureReader uses default platform encoding to read JSON - UTF-8 error Signed-off-by: Thomas Meyer <thomas.mey@web.de> Reviewed-by: Petros Splinakis <petros.splinakis@oracle.com>
diff --git a/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/internal/oxm/record/json/JsonParserReader.java b/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/internal/oxm/record/json/JsonParserReader.java index 0d31621..ad44411 100644 --- a/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/internal/oxm/record/json/JsonParserReader.java +++ b/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/internal/oxm/record/json/JsonParserReader.java
@@ -38,7 +38,6 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; -import java.io.InputStreamReader; import java.math.BigDecimal; import java.net.MalformedURLException; import java.net.URL; @@ -87,7 +86,7 @@ public void parse(InputSource input) throws IOException, SAXException { InputStream inputStream = null; try { if (null != (inputStream = input.getByteStream())) { - doParsing(Json.createParser(new InputStreamReader(inputStream))); + doParsing(Json.createParser(inputStream)); return; } @@ -101,7 +100,7 @@ public void parse(InputSource input) throws IOException, SAXException { throw malformedURLException; } } - doParsing(Json.createParser(new InputStreamReader(inputStream))); + doParsing(Json.createParser(inputStream)); } catch (JsonException je) { throw XMLMarshalException.unmarshalException(je); } finally {
diff --git a/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/internal/oxm/record/json/JsonStructureReader.java b/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/internal/oxm/record/json/JsonStructureReader.java index 8ca8b30..c3b028c 100644 --- a/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/internal/oxm/record/json/JsonStructureReader.java +++ b/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/internal/oxm/record/json/JsonStructureReader.java
@@ -16,7 +16,6 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; -import java.io.InputStreamReader; import java.net.MalformedURLException; import java.net.URL; import java.util.ArrayList; @@ -119,7 +118,7 @@ public void parse(InputSource input) throws IOException, SAXException, JsonExcep JsonReader jsonReader; if (null != input.getByteStream()) { inputStream = input.getByteStream(); - jsonReader = Json.createReader(new InputStreamReader(inputStream)); + jsonReader = Json.createReader(inputStream); } else if (null != input.getCharacterStream()) { jsonReader = Json.createReader(input.getCharacterStream()); } else { @@ -133,7 +132,7 @@ public void parse(InputSource input) throws IOException, SAXException, JsonExcep throw malformedURLException; } } - jsonReader = Json.createReader(new InputStreamReader(inputStream)); + jsonReader = Json.createReader(inputStream); } if (jsonReader != null) { JsonStructure structure = jsonReader.read();