You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by sh...@apache.org on 2018/05/02 19:21:56 UTC
[21/50] [abbrv] hadoop git commit: HDFS-12828. OIV ReverseXML
Processor fails with escaped characters
HDFS-12828. OIV ReverseXML Processor fails with escaped characters
Signed-off-by: Akira Ajisaka <aa...@apache.org>
(cherry picked from commit 2d9e791a9073de9f65fef5407efd3a42894bc97f)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/8f341c67
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/8f341c67
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/8f341c67
Branch: refs/heads/YARN-8200
Commit: 8f341c673f4db981544faba79d0c20bfe9c3fd99
Parents: b4b1078
Author: Erik Krogen <ek...@linkedin.com>
Authored: Wed Apr 18 14:38:23 2018 +0900
Committer: Akira Ajisaka <aa...@apache.org>
Committed: Wed Apr 18 14:40:45 2018 +0900
----------------------------------------------------------------------
.../tools/offlineImageViewer/OfflineImageReconstructor.java | 4 ++--
.../hdfs/tools/offlineImageViewer/TestOfflineImageViewer.java | 7 ++++++-
2 files changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/8f341c67/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/OfflineImageReconstructor.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/OfflineImageReconstructor.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/OfflineImageReconstructor.java
index 1f629b2..d14c61b 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/OfflineImageReconstructor.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/OfflineImageReconstructor.java
@@ -380,8 +380,8 @@ class OfflineImageReconstructor {
break;
case XMLEvent.CHARACTERS:
String val = XMLUtils.
- unmangleXmlString(ev.asCharacters().getData(), true);
- parent.setVal(val);
+ unmangleXmlString(ev.asCharacters().getData(), false);
+ parent.setVal(parent.getVal() + val);
events.nextEvent();
break;
case XMLEvent.ATTRIBUTE:
http://git-wip-us.apache.org/repos/asf/hadoop/blob/8f341c67/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/TestOfflineImageViewer.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/TestOfflineImageViewer.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/TestOfflineImageViewer.java
index 74e426e..d0a7567 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/TestOfflineImageViewer.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/TestOfflineImageViewer.java
@@ -153,10 +153,15 @@ public class TestOfflineImageViewer {
dirCount++;
writtenFiles.put(emptydir.toString(), hdfs.getFileStatus(emptydir));
- //Create a directory whose name should be escaped in XML
+ //Create directories whose name should be escaped in XML
Path invalidXMLDir = new Path("/dirContainingInvalidXMLChar\u0000here");
hdfs.mkdirs(invalidXMLDir);
dirCount++;
+ Path entityRefXMLDir = new Path("/dirContainingEntityRef&here");
+ hdfs.mkdirs(entityRefXMLDir);
+ dirCount++;
+ writtenFiles.put(entityRefXMLDir.toString(),
+ hdfs.getFileStatus(entityRefXMLDir));
//Create a directory with sticky bits
Path stickyBitDir = new Path("/stickyBit");
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org