Merge branch 'tweak/java-version' into 'dev'

Tweak/java version

See merge request crafty-controller/crafty-4!364

CHANGELOG.md

@@ -1,12 +1,12 @@
 # Changelog
 
-## [4.0.3] - TBD
+## [4.0.3] - 2022/06/18
 
 ### New features
- TBD
+None
 
 ### Bug fixes
-TBD
+- Amend Java system variable fix to be more specfic since they only affect Oracle. ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/364))
 
 ### Tweaks
 - Add better error logging for statistic collection ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/359))

app/classes/shared/server.py

@@ -239,6 +239,11 @@ class ServerInstance:
                 "Detected nebulous java in start command. "
                 "Replacing with full java path."
             )
+            # Checks for Oracle Java. Only Oracle Java's helper will cause a re-exec.
+            if "/Oracle/Java/" in str(shutil.which("java")):
+                logger.info(
+                    "Oracle Java detected. Changing start command to avoid re-exec."
+                )
                 which_java_raw = self.helper.which_java()
                 java_path = which_java_raw + "\\bin\\java"
                 if str(which_java_raw) != str(self.helper.get_servers_root_dir) or str(