Author: jing9 Date: Wed Jan 8 03:19:41 2014 New Revision: 1556433 URL: http://svn.apache.org/r1556433 Log: HDFS-5726. Fix compilation error in AbstractINodeDiff for JDK7. Contributed by Jing Zhao.
Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/AbstractINodeDiff.java Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1556433&r1=1556432&r2=1556433&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original) +++ hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Wed Jan 8 03:19:41 2014 @@ -473,6 +473,8 @@ Trunk (Unreleased) HDFS-5724. modifyCacheDirective logging audit log command wrongly as addCacheDirective (Uma Maheswara Rao G via Colin Patrick McCabe) + HDFS-5726. Fix compilation error in AbstractINodeDiff for JDK7. (jing9) + Release 2.4.0 - UNRELEASED INCOMPATIBLE CHANGES Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/AbstractINodeDiff.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/AbstractINodeDiff.java?rev=1556433&r1=1556432&r2=1556433&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/AbstractINodeDiff.java (original) +++ hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/AbstractINodeDiff.java Wed Jan 8 03:19:41 2014 @@ -130,8 +130,8 @@ abstract class AbstractINodeDiff<N exten @Override public String toString() { - return getClass().getSimpleName() + ": " + snapshotId + " (post=" - + (posteriorDiff == null? null: posteriorDiff.snapshotId) + ")"; + return getClass().getSimpleName() + ": " + this.getSnapshotId() + " (post=" + + (posteriorDiff == null? null: posteriorDiff.getSnapshotId()) + ")"; } void writeSnapshot(DataOutput out) throws IOException {