Apache/jclouds
1
0
Fork 0
mirror of https://github.com/apache/jclouds.git synced 2025-02-07 02:29:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

JCLOUDS-1510: ParseSax use charset constant for all String creations

Browse Source 
This commit prevents the convertStreamToStringAndParse method from
failing XML validation on environments in which the default charset is
not compatible with UTF-8.
This commit is contained in:
Roded Bahat 2019-08-12 18:46:56 +03:00 committed by Andrew Gaul
parent bd59263d47
commit d4b9f03059
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/main/java/org/jclouds/http/functions/ParseSax.java
View File

@ -25,6 +25,7 @@ import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.StringReader;
import java.nio.charset.StandardCharsets;
import javax.annotation.Resource;
@ -93,7 +94,7 @@ public class ParseSax<T> implements Function<HttpResponse, T>, InvocationContext
String from = null;
try {
byte[] fromBytes = closeClientButKeepContentStream(response);
from = new String(fromBytes);
from = new String(fromBytes, StandardCharsets.UTF_8);
validateXml(from);
// Use InputStream to skip over byte order mark.
return doParse(new InputSource(new ByteArrayInputStream(fromBytes)));
@ -134,7 +135,7 @@ public class ParseSax<T> implements Function<HttpResponse, T>, InvocationContext
protected T doParse(InputSource from) throws IOException, SAXException {
checkNotNull(from, "xml inputsource");
from.setEncoding("UTF-8");
from.setEncoding(StandardCharsets.UTF_8.name());
parser.setContentHandler(getHandler());
// This method should accept documents with a BOM (Byte-order mark)
parser.parse(from);