Properly invoke createTempDir from spark utils

lresende · lresende · commit b9bdf86b9c71 · 2016-07-13T10:39:18.000-07:00
diff --git a/spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java b/spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java
@@ -1143,24 +1143,25 @@ private Class findClass(String name) {
   }
 
   private File createTempDir(String dir) {
+    File file = null;
+
     // try Utils.createTempDir()
-    try {
-      return (File) Utils.class.getMethod(
-          "createTempDir",
-          new Class[]{String.class, String.class})
-          .invoke(null, new Object[]{dir, "spark"});
-    } catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException e) {
-      // fallback to old method
-      try {
-        return (File) Utils.class.getMethod(
-            "createTempDir",
-            new Class[]{String.class})
-            .invoke(null, new Object[]{dir});
-      } catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException e1) {
-        logger.error(e1.getMessage(), e1);
-        return null;
-      }
-    }
+    file = (File) Utils.invokeStaticMethod(
+      Utils.findClass("org.apache.spark.util.Utils"),
+      "createTempDir",
+      new Class[]{String.class, String.class},
+      new Object[]{dir, "spark"});
+
+    // fallback to old method
+    if (file == null) {
+      file = (File) Utils.invokeStaticMethod(
+        Utils.findClass("org.apache.spark.util.Utils"),
+        "createTempDir",
+        new Class[]{String.class},
+        new Object[]{dir});
+    }
+
+    return file;
   }
 
   private HttpServer createHttpServer(File outputDir) {
