Merge pull request #67 from jornfranke/main

Change order for loading default Trevas libraries and configuration
InseeFrLab · Nov 4, 2023 · 69f8519 · 69f8519
2 parents 4c33fc7 + 6aaedf4
commit 69f8519
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/main/java/fr/insee/trevas/jupyter/SparkUtils.java b/src/main/java/fr/insee/trevas/jupyter/SparkUtils.java
@@ -29,13 +29,13 @@ public static SparkSession buildSparkSession() {
         String spark_home = System.getenv("SPARK_HOME") + "/conf";
         Path path = Path.of(spark_home, "spark-defaults.conf");
         if (Files.exists(path)) {
-            org.apache.spark.util.Utils.loadDefaultSparkProperties(conf, path.normalize().toAbsolutePath().toString());
-            conf.set("spark.jars", String.join(",",
+             conf.set("spark.jars", String.join(",",
                     "/vtl-spark.jar",
                     "/vtl-model.jar",
                     "/vtl-parser.jar",
                     "/vtl-engine.jar"
             ));
+            org.apache.spark.util.Utils.loadDefaultSparkProperties(conf, path.normalize().toAbsolutePath().toString());
         } else {
             sparkBuilder.master("local");
         }