github
/
halo
mirror of https://github.com/halo-dev/halo
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix the problem of unit test failure under Java 21 (#7304) 

#### What type of PR is this?

/kind bug
/area core
/milestone 2.20.x

#### What this PR does / why we need it:

This PR adjusts the order of checking instance of ExecutorService and AutoCloseable interfaces. Because the ExecutorService extends AutoCloseable in Java 21. As a result, unit tests against the method won't be passed in Java 21.

#### Does this PR introduce a user-facing change?

```release-note
None
```
pull/7313/head
John Niang 2025-03-21 14:21:25 +08:00 committed by GitHub
parent e142b90349
commit 802666a7ce
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
api/src/main/java/run/halo/app/extension/controller/DefaultController.java
View File

@ -242,15 +242,17 @@ public class DefaultController<R> implements Controller {
} }
try { try {
if (executor instanceof AutoCloseable closeable) { // we have to check if the executor is an instance of ExecutorService at first.
// Because ExecutorService extends AutoCloseable interface in Java 21
if (executor instanceof ExecutorService executorService) {
closeExecutorService(executorService);
} else if (executor instanceof AutoCloseable closeable) {
closeable.close(); closeable.close();
if (Thread.currentThread().isInterrupted()) { if (Thread.currentThread().isInterrupted()) {
log.warn("Wait timeout for controller {} shutdown", name); log.warn("Wait timeout for controller {} shutdown", name);
} else { } else {
log.info("Controller {} is disposed", name); log.info("Controller {} is disposed", name);
} }
} else if (executor instanceof ExecutorService executorService) {
closeExecutorService(executorService);
} }
} catch (Exception e) { } catch (Exception e) {
log.warn("Interrupted while waiting for controller {} shutdown", name); log.warn("Interrupted while waiting for controller {} shutdown", name);