fix NPE when buffersList contains null in SmooshedFileMapper (apache#…

…5689) * fix NPE when buffersList contains null * address the comment
rkabhishek · Apr 28, 2018 · 4db9e39 · 4db9e39
1 parent 86746f8
commit 4db9e39
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/java-util/src/main/java/io/druid/java/util/common/io/smoosh/SmooshedFileMapper.java b/java-util/src/main/java/io/druid/java/util/common/io/smoosh/SmooshedFileMapper.java
@@ -19,7 +19,6 @@
 
 package io.druid.java.util.common.io.smoosh;
 
-import com.google.common.base.Throwables;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.io.Closeables;
@@ -143,6 +142,9 @@ public void close()
   {
     Throwable thrown = null;
     for (MappedByteBuffer mappedByteBuffer : buffersList) {
+      if (mappedByteBuffer == null) {
+        continue;
+      }
       try {
         ByteBufferUtils.unmap(mappedByteBuffer);
       }
@@ -154,6 +156,9 @@ public void close()
         }
       }
     }
-    Throwables.propagateIfPossible(thrown);
+    buffersList.clear();
+    if (thrown != null) {
+      throw new RuntimeException(thrown);
+    }
   }
 }