commit ddfeaf9a11fc82cb3b1225a5754285435f2f7fab
author gaoxinge <xg.gao@tianrang-inc.com> Mon Sep 21 22:34:28 2020 +0800
committer GitHub <noreply@github.com> Mon Sep 21 16:34:28 2020 +0200
tree 6a76815e87d216cad283617022ceae3da8862c0d
parent 8502c2e461f58162a3e498f093a49d4e2eb253f3

Fix potential NullPointerException when local book keeper stop on exit

Descriptions of the changes in this PR: 

- Fix potential NullPointerException when local book keeper stop on exit.

Reviewers: Enrico Olivelli <eolivelli@gmail.com>, Sijie Guo <sijie@apache.org>

This closes #2414 from gaoxinge/fix

bookkeeper-server/src/main/java/org/apache/bookkeeper/util/LocalBookKeeper.java

diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/LocalBookKeeper.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/LocalBookKeeper.java
index d9570ff..c264e6b 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/LocalBookKeeper.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/LocalBookKeeper.java
@@ -168,7 +168,7 @@
 
     private List<File> runBookies(String dirSuffix)
             throws Exception {
-        List<File> tempDirs = new ArrayList<File>();
+        List<File> tempDirs = new ArrayList<>();
         try {
             runBookies(tempDirs, dirSuffix);
             return tempDirs;
@@ -391,7 +391,9 @@
             throw e;
         } finally {
             if (stopOnExit) {
-                cleanupDirectories(bkTmpDirs);
+                if (null != bkTmpDirs) {
+                    cleanupDirectories(bkTmpDirs);
+                }
                 if (null != zkTmpDir) {
                     FileUtils.deleteDirectory(zkTmpDir);
                 }