Skip to content
This repository has been archived by the owner on Dec 3, 2021. It is now read-only.

Commit

Permalink
fix: make Jettys threads use gravitee context class loader
Browse files Browse the repository at this point in the history
Jetty version has been upgraded in this commit : gravitee-io/gravitee-bom@6eb8566
It introduced mutliple regressions in APIM.

Since 9.4.37, Jettys threads classloaders have been refactored to fix a leak (see jetty/jetty.project#5894).
After this fix, threads classpath is override with local classpath, so it does not contain gravitee context class loader nomore (see https://github.com/eclipse/jetty.project/pull/5894/files#diff-6f0181889aa765771dd358e58fc07e2a7d7bfa44c451359e34e3eea574a5a79cR696).

Created a JettyQueuedThreadPool, to override Jetty's default QueuedThreadPool and give the gravitee context class loader to created threads.
  • Loading branch information
Marc authored and marcambier committed Nov 3, 2021
1 parent 2c9959d commit 7317b95
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 1 deletion.
@@ -0,0 +1,37 @@
/**
* Copyright (C) 2015 The Gravitee team (http://gravitee.io)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.gravitee.rest.api.standalone.jetty;

import java.util.concurrent.ArrayBlockingQueue;
import org.eclipse.jetty.util.thread.QueuedThreadPool;

/**
* JettyQueueThreadPool extends Jetty's default QueuedThreadPool,
* Overriding thread creation to make them use the Gravitee context class loader.
*/
public class JettyQueuedThreadPool extends QueuedThreadPool {

public JettyQueuedThreadPool(int poolMaxThreads, int poolMinThreads, int poolIdleTimeout, ArrayBlockingQueue<Runnable> queue) {
super(poolMaxThreads, poolMinThreads, poolIdleTimeout, queue);
}

@Override
public Thread newThread(Runnable runnable) {
Thread thread = super.newThread(runnable);
thread.setContextClassLoader(Thread.currentThread().getContextClassLoader());
return thread;
}
}
Expand Up @@ -41,7 +41,7 @@ public class JettyServerFactory implements FactoryBean<Server> {
@Override
public Server getObject() throws Exception {
// Setup ThreadPool
QueuedThreadPool threadPool = new QueuedThreadPool(
QueuedThreadPool threadPool = new JettyQueuedThreadPool(
jettyConfiguration.getPoolMaxThreads(),
jettyConfiguration.getPoolMinThreads(),
jettyConfiguration.getPoolIdleTimeout(),
Expand Down

0 comments on commit 7317b95

Please sign in to comment.