Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish JettyResourceFactory

Browse Source 
Issue: SPR-17179
This commit is contained in:
Sebastien Deleuze
2018-08-16 21:04:23 +02:00
parent 6bcb454a0d
commit 0dd9e8ce02
1 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
spring-web/src/main/java/org/springframework/http/client/reactive/JettyResourceFactory.java
View File

@@ -23,7 +23,7 @@ import java.util.concurrent.Executor;
import org.eclipse.jetty.io.ByteBufferPool; import org.eclipse.jetty.io.ByteBufferPool;
import org.eclipse.jetty.io.MappedByteBufferPool; import org.eclipse.jetty.io.MappedByteBufferPool;
import org.eclipse.jetty.util.ProcessorUtils; import org.eclipse.jetty.util.ProcessorUtils;
import org.eclipse.jetty.util.component.ContainerLifeCycle; import org.eclipse.jetty.util.component.LifeCycle;
import org.eclipse.jetty.util.thread.QueuedThreadPool; import org.eclipse.jetty.util.thread.QueuedThreadPool;
import org.eclipse.jetty.util.thread.ScheduledExecutorScheduler; import org.eclipse.jetty.util.thread.ScheduledExecutorScheduler;
import org.eclipse.jetty.util.thread.Scheduler; import org.eclipse.jetty.util.thread.Scheduler;
@@ -127,7 +127,6 @@ public class JettyResourceFactory implements InitializingBean, DisposableBean {
if (this.executor == null) { if (this.executor == null) {
QueuedThreadPool threadPool = new QueuedThreadPool(); QueuedThreadPool threadPool = new QueuedThreadPool();
threadPool.setName(name); threadPool.setName(name);
threadPool.start();
this.executor = threadPool; this.executor = threadPool;
} }
if (this.byteBufferPool == null) { if (this.byteBufferPool == null) {
@@ -137,19 +136,32 @@ public class JettyResourceFactory implements InitializingBean, DisposableBean {
: ProcessorUtils.availableProcessors() * 2); : ProcessorUtils.availableProcessors() * 2);
} }
if (this.scheduler == null) { if (this.scheduler == null) {
Scheduler scheduler = new ScheduledExecutorScheduler(name + "-scheduler", false); this.scheduler = new ScheduledExecutorScheduler(name + "-scheduler", false);
scheduler.start();
this.scheduler = scheduler;
} }
if (this.executor instanceof LifeCycle) {
((LifeCycle)this.executor).start();
}
this.scheduler.start();
} }
@Override @Override
public void destroy() throws Exception { public void destroy() throws Exception {
if (this.executor instanceof ContainerLifeCycle) { try {
((ContainerLifeCycle)this.executor).stop(); if (this.executor instanceof LifeCycle) {
((LifeCycle)this.executor).stop();
}
} }
if (this.scheduler != null) { catch (Throwable ex) {
this.scheduler.stop(); // ignore
}
try {
if (this.scheduler != null) {
this.scheduler.stop();
}
}
catch (Throwable ex) {
// ignore
} }
} }