Skip to content

[FLINK-38503] Adapt DefaultClusterClientServiceLoader to java 25 #28250

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
snuyanzin merged 1 commit into from
May 26, 2026
+17 −4
Merged

[FLINK-38503] Adapt DefaultClusterClientServiceLoader to java 25 #28250

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 17 additions & 4 deletions ...s/src/main/java/org/apache/flink/client/deployment/DefaultClusterClientServiceLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,21 @@ public <ClusterID> ClusterClientFactory<ClusterID> getClusterClientFactory(

final List<ClusterClientFactory> compatibleFactories = new ArrayList<>();
final Iterator<ClusterClientFactory> factories = loader.iterator();
while (factories.hasNext()) {
while (true) {
try {
// hasNext might lead to error in java 24, 25
// for more details take a look at https://bugs.openjdk.org/browse/JDK-8196182
// and https://bugs.openjdk.org/browse/JDK-8350481
if (!factories.hasNext()) {
break;
}
final ClusterClientFactory factory = factories.next();
if (factory != null && factory.isCompatibleWith(configuration)) {
compatibleFactories.add(factory);
}
} catch (Throwable e) {
if (e.getCause() instanceof NoClassDefFoundError) {
if (e instanceof NoClassDefFoundError
|| e.getCause() instanceof NoClassDefFoundError) {
LOG.info("Could not load factory due to missing dependencies.");
} else {
throw e;
Expand Down Expand Up @@ -98,16 +105,22 @@ public Stream<String> getApplicationModeTargetNames() {
final List<String> result = new ArrayList<>();

final Iterator<ClusterClientFactory> it = loader.iterator();
while (it.hasNext()) {
while (true) {
try {
// hasNext might lead to error in java 24, 25
// for more details take a look at https://bugs.openjdk.org/browse/JDK-8196182
// and https://bugs.openjdk.org/browse/JDK-8350481
if (!it.hasNext()) {
break;
}
final ClusterClientFactory clientFactory = it.next();

final Optional<String> applicationName = clientFactory.getApplicationTargetName();
if (applicationName.isPresent()) {
result.add(applicationName.get());
}

} catch (ServiceConfigurationError e) {
} catch (ServiceConfigurationError | NoClassDefFoundError e) {
// cannot be loaded, most likely because Hadoop is not
// in the classpath, we can ignore it for now.
}
Expand Down