Nest these so we're not doing useless checks

headius · headius · commit 06f1ecbfc8ca · 2025-03-25T20:30:26.000-05:00
diff --git a/bin/jruby.sh b/bin/jruby.sh
@@ -511,41 +511,52 @@ add_log "Detected Java version: $java_version"
 # Split version out for integer comparisons
 java_major=${java_version%%.*}
 
-# AppCDS support
-if [ "$java_major" -ge 13 ] && exists "$JAVA_HOME"/lib/server/*.jsa; then
-    java_has_appcds=true
-else
-    java_has_appcds=false
-fi
-readonly java_has_appcds
+# Java version-specific tuning flags
+if [ "$java_major" -ge 13 ]; then
+    if exists "$JAVA_HOME"/lib/server/*.jsa; then
+        # AppCDS support
+        java_has_appcds=true
+    else
+        java_has_appcds=false
+    fi
 
-# Default to using AppCDS if available
-use_jsa_file="$java_has_appcds"
+    if [ "$java_major" -ge 19 ]; then
+        # AppCDS autogeneration
+        java_has_appcds_autogenerate=true
 
-# AppCDS autogeneration
-if [ "$java_major" -ge 19 ]; then
-    java_has_appcds_autogenerate=true
-else
-    java_has_appcds_autogenerate=false
-fi
-readonly java_has_appcds_autogenerate
+        if [ " $java_major" -ge 22 ]; then
+            # Native access
+            enable_native_access=true
 
-# Native access
-if [ " $java_major" -ge 22 ]; then
-    enable_native_access=true
+            if [ " $java_major" -ge 23 ]; then
+                # Unsafe memory
+                enable_unsafe_memory=true
+            else
+                enable_unsafe_memory=false
+            fi
+        else
+            enable_native_access=false
+            enable_unsafe_memory=false
+        fi
+    else
+        java_has_appcds_autogenerate=false
+        enable_native_access=false
+        enable_unsafe_memory=false
+    fi
 else
+    java_has_appcds=false
+    java_has_appcds_autogenerate=false
     enable_native_access=false
-fi
-readonly enable_native_access
-
-# Native access
-if [ " $java_major" -ge 23 ]; then
-    enable_unsafe_memory=true
-else
     enable_unsafe_memory=false
 fi
+readonly java_has_appcds
+readonly java_has_appcds_autogenerate
+readonly enable_native_access
 readonly enable_unsafe_memory
 
+# Default to using AppCDS if available
+use_jsa_file="$java_has_appcds"
+
 # ----- Process .java_opts files ----------------------------------------------
 
 # We include options on the java command line in the following order:
