From 97a3a0a1ba5264580b1cbaf2a1dd755695279f3c Mon Sep 17 00:00:00 2001 From: Petr Aubrecht Date: Tue, 26 Apr 2022 14:45:57 +0200 Subject: [PATCH] fix managed thread factory tests - context is saved before execution, not jndi lookup --- .../ManagedThreadFactoryDefinitionServlet.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/tck/src/main/java/ee/jakarta/tck/concurrent/spec/ManagedThreadFactory/resourcedef/ManagedThreadFactoryDefinitionServlet.java b/tck/src/main/java/ee/jakarta/tck/concurrent/spec/ManagedThreadFactory/resourcedef/ManagedThreadFactoryDefinitionServlet.java index 1b792af0..cb2e9325 100644 --- a/tck/src/main/java/ee/jakarta/tck/concurrent/spec/ManagedThreadFactory/resourcedef/ManagedThreadFactoryDefinitionServlet.java +++ b/tck/src/main/java/ee/jakarta/tck/concurrent/spec/ManagedThreadFactory/resourcedef/ManagedThreadFactoryDefinitionServlet.java @@ -196,14 +196,8 @@ public void testParallelStreamBackedByManagedThreadFactory() throws Throwable { ManagedThreadFactory threadFactory = InitialContext.doLookup("java:app/concurrent/ThreadFactoryA"); - IntContext.set(2000); - StringContext.set("testParallelStreamBackedByManagedThreadFactory-2"); - fj = new ForkJoinPool(4, threadFactory, null, false); - IntContext.set(3000); - StringContext.set("testParallelStreamBackedByManagedThreadFactory-3"); - ForkJoinTask> task = fj.submit(() -> { return Arrays.asList(1, 2, 3, 4, 5, 6, 7, 8, 9) .parallelStream() @@ -222,6 +216,9 @@ public void testParallelStreamBackedByManagedThreadFactory() throws Throwable { .reduce(Integer::sum); }); + IntContext.set(3000); + StringContext.set("testParallelStreamBackedByManagedThreadFactory-3"); + Optional result = task.join(); assertEquals(result.get(), Integer.valueOf(9180), "Third-party context type IntContext must propagated to ForkJoin threads " +