HDFS-6033. PBImageXmlWriter incorrectly handles processing cache directives. Contributed by Aaron T. Myers.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1573050 13f79535-47bb-0310-9956-ffa450edef68

hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt

@@ -505,6 +505,9 @@ Release 2.4.0 - UNRELEASED
     HDFS-5339. WebHDFS URI does not accept logical nameservices when security is
     enabled. (Haohui Mai via jing9)
 
+    HDFS-6033. PBImageXmlWriter incorrectly handles processing cache
+    directives. (atm)
+
   BREAKDOWN OF HDFS-5698 SUBTASKS AND RELATED JIRAS
 
     HDFS-5717. Save FSImage header in protobuf. (Haohui Mai via jing9)

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/PBImageXmlWriter.java

@@ -157,7 +157,7 @@ public final class PBImageXmlWriter {
           .o("maxRelativeExpiry", p.getMaxRelativeExpiry());
       out.print("</pool>\n");
     }
-    for (int i = 0; i < s.getNumPools(); ++i) {
+    for (int i = 0; i < s.getNumDirectives(); ++i) {
       CacheDirectiveInfoProto p = CacheDirectiveInfoProto
           .parseDelimitedFrom(is);
       out.print("<directive>");