You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tajo.apache.org by jh...@apache.org on 2018/07/12 04:04:58 UTC

tajo git commit: TAJO-2188: Can't start tajo daemon on HDP,CDH

Repository: tajo
Updated Branches:
  refs/heads/master 4f3c386eb -> 9e8b8319a


TAJO-2188: Can't start tajo daemon on HDP,CDH

Closes #1054


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

Branch: refs/heads/master
Commit: 9e8b8319a2e737aa1a599bdf5b25df3370a7c64b
Parents: 4f3c386
Author: Jinho Kim <jh...@apache.org>
Authored: Thu Jul 12 12:59:26 2018 +0900
Committer: Jinho Kim <jh...@apache.org>
Committed: Thu Jul 12 12:59:26 2018 +0900

----------------------------------------------------------------------
 CHANGES                                                       | 2 ++
 tajo-common/src/main/java/org/apache/tajo/util/ClassUtil.java | 7 +++++--
 2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tajo/blob/9e8b8319/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 7870f33..82b8489 100644
--- a/CHANGES
+++ b/CHANGES
@@ -169,6 +169,8 @@ Release 0.12.0 - unreleased
 
   BUG FIXES
 
+    TAJO-2188: Can't start tajo daemon on HDP,CDH (jinho)
+
     TAJO-2184: Can not run Tajo with non-default $TAJO_CONF_DIR (Lee Dongjin via hyunsik)
 
     TAJO-2177: In BroadcastJoinRule, the total volume of broadcast tables should be 

http://git-wip-us.apache.org/repos/asf/tajo/blob/9e8b8319/tajo-common/src/main/java/org/apache/tajo/util/ClassUtil.java
----------------------------------------------------------------------
diff --git a/tajo-common/src/main/java/org/apache/tajo/util/ClassUtil.java b/tajo-common/src/main/java/org/apache/tajo/util/ClassUtil.java
index c93b751..d85ce9d 100644
--- a/tajo-common/src/main/java/org/apache/tajo/util/ClassUtil.java
+++ b/tajo-common/src/main/java/org/apache/tajo/util/ClassUtil.java
@@ -57,8 +57,11 @@ public abstract class ClassUtil {
   private static void findClasses(Set<Class> matchedClassSet, File root, File file, boolean includeJars,
                                   @Nullable Class type, String packageFilter, @Nullable Predicate predicate) {
     if (file.isDirectory()) {
-      for (File child : file.listFiles()) {
-        findClasses(matchedClassSet, root, child, includeJars, type, packageFilter, predicate);
+      File[] children = file.listFiles();
+      if (children != null) {
+        for (File child : children) {
+          findClasses(matchedClassSet, root, child, includeJars, type, packageFilter, predicate);
+        }
       }
     } else {
       if (file.getName().toLowerCase().endsWith(".jar") && includeJars) {