set spark version to 1.6.2 and throw original exception

mfelgamal · mfelgamal · commit 55c1322356bc · 2016-09-23T13:57:59.000+02:00
diff --git a/beam/pom.xml b/beam/pom.xml
@@ -34,7 +34,7 @@
   
   <properties>
     <beam.hadoop.version>2.3.0</beam.hadoop.version>
-    <beam.spark.version>1.6.1</beam.spark.version>
+    <beam.spark.version>1.6.2</beam.spark.version>
     <beam.beam.version>0.2.0-incubating</beam.beam.version>
   </properties>
   
diff --git a/beam/src/main/java/org/apache/zeppelin/beam/StaticRepl.java b/beam/src/main/java/org/apache/zeppelin/beam/StaticRepl.java
@@ -69,7 +69,8 @@ public static String execute(String generatedClassName, String code) throws Exce
       boolean hasMain = false;
 
       for (int j = 0; j < classes.get(i).getMethods().size(); j++) {
-        if (classes.get(i).getMethods().get(j).getName().equals("main")) {
+        if (classes.get(i).getMethods().get(j).getName().equals("main") && classes.get(i)
+            .getMethods().get(j).getModifiers().toString().contains("static")) {          
           mainClassName = classes.get(i).getName();
           hasMain = true;
           break;
@@ -83,8 +84,9 @@ public static String execute(String generatedClassName, String code) throws Exce
 
     // if there isn't Main method, will retuen error
     if (mainClassName == null) {
-      logger.error("Exception for Main method", "There isn't any class containing Main method.");
-      throw new Exception("There isn't any class containing Main method.");
+      logger.error("Exception for Main method", "There isn't any class "
+          + "containing static main method.");
+      throw new Exception("There isn't any class containing static main method.");
     }
 
     // replace name of class containing Main method with generated name
@@ -152,7 +154,7 @@ public static String execute(String generatedClassName, String code) throws Exce
         logger.error("Exception in Interpreter while execution", e);
         System.err.println(e);
         e.printStackTrace(newErr);
-        throw new Exception(baosErr.toString());
+        throw new Exception(baosErr.toString(), e);
 
       } finally {
 
