You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by dr...@apache.org on 2017/04/28 11:01:41 UTC
[1/2] brooklyn-server git commit: BROOKLYN-489: Fix XmlUtil.xpath
character encoding
Repository: brooklyn-server
Updated Branches:
refs/heads/master cbc9b73a3 -> 33abb3060
BROOKLYN-489: Fix XmlUtil.xpath character encoding
Be explicit to use UTF_8. Otherwise, on some environments
(e.g. windows?) it could use a different encoding
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/f338dce6
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/f338dce6
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/f338dce6
Branch: refs/heads/master
Commit: f338dce6cf22d31f7abf4900a0093d7ab938b143
Parents: 022fb2f
Author: Aled Sage <al...@gmail.com>
Authored: Tue Apr 25 20:22:16 2017 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Thu Apr 27 13:08:21 2017 +0100
----------------------------------------------------------------------
.../java/org/apache/brooklyn/util/core/xstream/XmlUtil.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/f338dce6/core/src/main/java/org/apache/brooklyn/util/core/xstream/XmlUtil.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/util/core/xstream/XmlUtil.java b/core/src/main/java/org/apache/brooklyn/util/core/xstream/XmlUtil.java
index 8c4cc3d..e989d5f 100644
--- a/core/src/main/java/org/apache/brooklyn/util/core/xstream/XmlUtil.java
+++ b/core/src/main/java/org/apache/brooklyn/util/core/xstream/XmlUtil.java
@@ -18,8 +18,8 @@
*/
package org.apache.brooklyn.util.core.xstream;
-import java.io.ByteArrayInputStream;
import java.io.IOException;
+import java.io.StringReader;
import javax.xml.namespace.QName;
import javax.xml.parsers.DocumentBuilder;
@@ -32,6 +32,7 @@ import javax.xml.xpath.XPathFactory;
import org.apache.brooklyn.util.exceptions.Exceptions;
import org.w3c.dom.Document;
+import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import com.google.common.annotations.Beta;
@@ -65,7 +66,7 @@ public class XmlUtil {
public static Object xpath(String xml, String xpath, QName returnType) {
try {
DocumentBuilder builder = SharedDocumentBuilder.get();
- Document doc = builder.parse(new ByteArrayInputStream(xml.getBytes()));
+ Document doc = builder.parse(new InputSource(new StringReader(xml)));
XPathFactory xPathfactory = XPathFactory.newInstance();
XPathExpression expr = xPathfactory.newXPath().compile(xpath);
[2/2] brooklyn-server git commit: This closes #652
Posted by dr...@apache.org.
This closes #652
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/33abb306
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/33abb306
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/33abb306
Branch: refs/heads/master
Commit: 33abb30601f8bd038e08ba29bef423ac0d635d0e
Parents: cbc9b73 f338dce
Author: Duncan Godwin <dr...@googlemail.com>
Authored: Fri Apr 28 12:01:34 2017 +0100
Committer: Duncan Godwin <dr...@googlemail.com>
Committed: Fri Apr 28 12:01:34 2017 +0100
----------------------------------------------------------------------
.../java/org/apache/brooklyn/util/core/xstream/XmlUtil.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------