Merge branch 'federico' into develop

musif/extract/features/jsymbolic/utils.py

@@ -19,21 +19,25 @@ class JavaNotFoundError(RuntimeError):
 
 
 def get_java_path():
-    java = __get_java_path_env()
-    if java is not None:
-        return java
-    java = __get_java_path_subprocess()
-    if java is not None:
-        return java
-    java = __get_java_path_env()
-    if java is not None:
-        return java
+    try:
+        java = __get_java_path_env()
+        if java is not None:
+            return java
+        java = __get_java_path_shutil()
+        if java is not None:
+            return java
+    except Exception as e:
+        exc = "Raised exception: " + str(e)
+    else:
+        exc = ""
     raise JavaNotFoundError(
-        "Could not find Java Runtime Environment (JRE)! Please, set JAVA_HOME environment variable or make it available in the PATH."
+        "Could not find Java Runtime Environment (JRE)! Please, set JAVA_HOME environment variable or make it available in the PATH. " + exc
     )
 
 
 def __get_java_path_env():
+    if "JAVA_HOME" not in os.environ:
+        return None
     if sys.platform == "win32":
         java = os.path.join(os.environ["JAVA_HOME"], "bin", "java.exe")
     else:
@@ -49,13 +53,6 @@ def __get_java_path_shutil():
     return path
 
 
-def __get_java_path_subprocess():
-    try:
-        return subprocess.check_output(["which", "java"]).decode("utf-8").strip()
-    except subprocess.CalledProcessError:
-        return None
-
-
 def _jsymbolic_path():
     if platform.system() == "Windows":
         cache_dir = Path(os.getenv("APPDATA"), "jSymbolic")