HIVE-19265 : Potential NPE and hiding actual exception in Hive#copyFiles (Igor 
Kryvenko via Ashutosh Chauhan)

Signed-off-by: Ashutosh Chauhan <hashut...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/cce0e377
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/cce0e377
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/cce0e377

Branch: refs/heads/storage-branch-2.6
Commit: cce0e3777d178e68f38a0c9335d44a12fff42a6b
Parents: f019950
Author: Igor Kryvenko <kryvenko7i...@gmail.com>
Authored: Mon Apr 23 18:52:27 2018 -0700
Committer: Ashutosh Chauhan <hashut...@apache.org>
Committed: Mon Apr 23 18:52:27 2018 -0700

----------------------------------------------------------------------
 ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/cce0e377/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java 
b/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java
index 69d42e3..4661881 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java
@@ -3291,7 +3291,9 @@ private void constructOneLBLocationMap(FileStatus fSta,
         try {
           files = srcFs.listStatus(src.getPath(), 
FileUtils.HIDDEN_FILES_PATH_FILTER);
         } catch (IOException e) {
-          pool.shutdownNow();
+          if (null != pool) {
+            pool.shutdownNow();
+          }
           throw new HiveException(e);
         }
       } else {

Reply via email to