Repository: hadoop Updated Branches: refs/heads/branch-2.9 08ca224ae -> ac1f9e2ab
HDFS-12828. OIV ReverseXML Processor fails with escaped characters Signed-off-by: Akira Ajisaka <[email protected]> (cherry picked from commit 2d9e791a9073de9f65fef5407efd3a42894bc97f) (cherry picked from commit 8f341c673f4db981544faba79d0c20bfe9c3fd99) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ac1f9e2a Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ac1f9e2a Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ac1f9e2a Branch: refs/heads/branch-2.9 Commit: ac1f9e2ab905c0f6cc700aa5ac031e06856fcc2c Parents: 08ca224 Author: Erik Krogen <[email protected]> Authored: Wed Apr 18 14:38:23 2018 +0900 Committer: Akira Ajisaka <[email protected]> Committed: Wed Apr 18 14:41:12 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/ac1f9e2a/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/ac1f9e2a/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: [email protected] For additional commands, e-mail: [email protected]
