HDFS-10930.06.patch

xiaoyuyao · xiaoyuyao · commit 1cd7ae811f43 · 2016-11-14T19:11:24.000-08:00
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/BlockPoolSlice.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/BlockPoolSlice.java
@@ -750,7 +750,9 @@ private long validateIntegrityAndSetLength(File blockFile, long genStamp) {
       FsDatasetImpl.LOG.warn(e);
       return 0;
     } finally {
-      ris.close();
+      if (ris != null) {
+        ris.close();
+      }
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -750,7 +750,9 @@ private long validateIntegrityAndSetLength(File blockFile, long genStamp) {`
`750`	`750`	`FsDatasetImpl.LOG.warn(e);`
`751`	`751`	`return 0;`
`752`	`752`	`} finally {`
`753`		`- ris.close();`
	`753`	`+ if (ris != null) {`
	`754`	`+ ris.close();`
	`755`	`+ }`
`754`	`756`	`}`
`755`	`757`	`}`
`756`	`758`