Skip to content

Commit 7643ee0

Browse files
committed
Fix executor scope bug
1 parent ddad958 commit 7643ee0

File tree

2 files changed

+1
-7
lines changed

2 files changed

+1
-7
lines changed

io/src/main/java/org/red5/codec/HEVCVideo.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
import java.util.concurrent.CopyOnWriteArrayList;
1111

1212
import org.apache.mina.core.buffer.IoBuffer;
13-
import org.red5.io.IoConstants;
14-
import org.red5.util.ByteNibbler;
1513

1614
/**
1715
* Red5 video codec for the HEVC (h265) video format. Stores DecoderConfigurationRecord and last keyframe.

server/src/main/java/org/red5/server/tomcat/TomcatLoader.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -205,8 +205,7 @@ public void afterPropertiesSet() throws Exception {
205205
// if we are not awaiting plugins, start immediately
206206
if (awaitPlugins) {
207207
log.info("Awaiting plugin loading");
208-
executor = Executors.newVirtualThreadPerTaskExecutor();
209-
executor.submit(() -> {
208+
Executors.newVirtualThreadPerTaskExecutor().submit(() -> {
210209
Thread.currentThread().setName("TomcatLoader-delayed-start");
211210
try {
212211
// wait for plugins to load but only up to 60 seconds
@@ -955,9 +954,6 @@ public void destroy() throws Exception {
955954
deployer.stop();
956955
deployer = null;
957956
}
958-
if (executor != null) {
959-
executor.shutdown();
960-
}
961957
// run through the applications and ensure that spring is told to commence shutdown / disposal
962958
AbstractApplicationContext absCtx = (AbstractApplicationContext) LoaderBase.getApplicationContext();
963959
if (absCtx != null) {

0 commit comments

Comments
 (0)