Switch priority of detecting directory of CARLA sim

usdot-fhwa-stol · Aug 5, 2022 · 99ac004 · 99ac004
1 parent ac4990d
commit 99ac004
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/...d/mosaic-carla/src/main/java/org/eclipse/mosaic/fed/carla/ambassador/CarlaAmbassador.java b/...d/mosaic-carla/src/main/java/org/eclipse/mosaic/fed/carla/ambassador/CarlaAmbassador.java
@@ -169,13 +169,14 @@ public FederateExecutor createFederateExecutor(String host, int port, CLocalHost
      */
     String getCarlaExecutable(String executable) {
         String carlaHome = null;
-        if (System.getenv("CARLA_HOME") != null) {
-            carlaHome = System.getenv("CARLA_HOME");
-            log.info("use carla path from environmental variable: " + carlaHome);
-        } else if (carlaConfig.carlaUE4Path != null) {
+        if (carlaConfig.carlaUE4Path != null) {
             carlaHome = carlaConfig.carlaUE4Path;
             log.info("use carla path from configuration file: " + carlaHome);
         }
+        else if (System.getenv("CARLA_HOME") != null) {
+            carlaHome = System.getenv("CARLA_HOME");
+            log.info("use carla path from environmental variable: " + carlaHome);
+        }
         if (StringUtils.isNotBlank(carlaHome)) {
             boolean isWindows = System.getProperty("os.name").toLowerCase().startsWith("windows");
             if (isWindows) {