@@ -6386,11 +6386,10 @@ def _get_java_runtimes_from_container_settings(container_settings):
63866386 # Fallback: Get runtimes from additional_properties (java*Runtime keys)
63876387 for key, value in additional_props.items():
63886388 # Match pattern like "java25Runtime", "java21Runtime", etc.
6389- if key.startswith('java') and key.endswith('Runtime') and value:
6390- # Extract version number from key (e.g., "25" from "java25Runtime")
6391- version = key[4:-7] # Remove "java" prefix and "Runtime" suffix
6392- if version.isdigit():
6393- runtimes.append((value, version, is_auto_update))
6389+ match = re.match(r'^java(\d+)Runtime$', key)
6390+ if match and value:
6391+ version = match.group(1)
6392+ runtimes.append((value, version, is_auto_update))
63946393
63956394 # Also get runtimes from SDK-defined properties (java8_runtime, java11_runtime)
63966395 if getattr(container_settings, 'java11_runtime', None):
@@ -6496,7 +6495,7 @@ def _parse_major_version_linux(self, major_version, parsed_results, seen_runtime
64966495 se_containers = [minor_java_container_versions[0]] if minor_java_container_versions else []
64976496 for java in java_versions:
64986497 se_java_containers = [c for c in minor_java_container_versions if c.value.startswith(java)]
6499- se_containers = se_containers + se_java_containers[:len(se_java_containers) if len(se_java_containers) < 2 else 2] # pylint: disable=line-too-long
6498+ se_containers = se_containers + se_java_containers[:min( len(se_java_containers), 2)]
65006499 minor_java_container_versions = se_containers
65016500 if minor_java_container_versions:
65026501 leng = len(minor_java_container_versions) if \
0 commit comments