Skip to content

Fix ExecutorService leak in WS-RM oneway tests #2963

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

Open
gnodet wants to merge 1 commit into
base: main
Choose a base branch
from
+23 −0
Open

Fix ExecutorService leak in WS-RM oneway tests #2963

Show file tree
Hide file tree
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
11 changes: 11 additions & 0 deletions systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DeliveryAssuranceOnewayTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ public class DeliveryAssuranceOnewayTest extends AbstractBusClientServerTestBase
private Endpoint endpoint;
private Bus greeterBus;
private Greeter greeter;
private ExecutorService executorService;

@After
public void tearDown() throws Exception {
Expand All @@ -89,6 +90,13 @@ public void tearDown() throws Exception {
} catch (Throwable t) {
//ignore
}
if (executorService != null) {
executorService.shutdown();
if (!executorService.awaitTermination(10, TimeUnit.SECONDS)) {
executorService.shutdownNow();
}
executorService = null;
}
Thread.sleep(100);
}

Expand Down Expand Up @@ -380,6 +388,9 @@ private void initProxy(Executor executor) {

if (null != executor) {
gs.setExecutor(executor);
if (executor instanceof ExecutorService) {
this.executorService = (ExecutorService) executor;
}
}

greeter = gs.getGreeterPort();
Expand Down
12 changes: 12 additions & 0 deletions systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/MessageCallbackOnewayTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import java.util.Set;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.Executor;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeUnit;
Expand Down Expand Up @@ -81,6 +82,7 @@ public class MessageCallbackOnewayTest extends AbstractBusClientServerTestBase {
private Bus greeterBus;
private Greeter greeter;
private RecordingMessageCallback callback;
private ExecutorService executorService;

@After
public void tearDown() throws Exception {
Expand All @@ -94,6 +96,13 @@ public void tearDown() throws Exception {
} catch (Throwable t) {
//ignore
}
if (executorService != null) {
executorService.shutdown();
if (!executorService.awaitTermination(10, TimeUnit.SECONDS)) {
executorService.shutdownNow();
}
executorService = null;
}
}

@Test(timeout = 60000)
Expand Down Expand Up @@ -216,6 +225,9 @@ private void initProxy(Executor executor) {

if (null != executor) {
gs.setExecutor(executor);
if (executor instanceof ExecutorService) {
this.executorService = (ExecutorService) executor;
}
}

greeter = gs.getGreeterPort();
Expand Down