From 1cd7ae811f43380044c29b89b53f27f629f85c5f Mon Sep 17 00:00:00 2001
From: Xiaoyu Yao <xyao@apache.org>
Date: Mon, 14 Nov 2016 18:41:48 -0800
Subject: [PATCH] HDFS-10930.06.patch

---
 .../hdfs/server/datanode/fsdataset/impl/BlockPoolSlice.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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
index ebc41643ec49f..f2f5a7f7a2cc1 100644
--- 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();
+      }
     }
   }