(cxf) 02/02: Fix unstable JAXRS20ClientServerBookTest::testGetGenericBookSingleClientInParallel test case

[reta]

This is an automated email from the ASF dual-hosted git repository.

reta pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit be13c31b5852a59a033990abbddc9be20e201b62
Author: Andriy Redko <drr...@gmail.com>
AuthorDate: Sat Jun 15 16:54:25 2024 -0400

    Fix unstable 
JAXRS20ClientServerBookTest::testGetGenericBookSingleClientInParallel test case
---
 coverage/pom.xml                                         |  4 ----
 .../cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java   | 16 ++++++----------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/coverage/pom.xml b/coverage/pom.xml
index 30042f5c7d..dc15a92e3d 100644
--- a/coverage/pom.xml
+++ b/coverage/pom.xml
@@ -28,10 +28,6 @@
     <description>Apache CXF coverage report</description>
     <packaging>pom</packaging>
 
-    <properties>
-        
<sonar.coverage.jacoco.xmlReportPaths>${project.basedir}/target/site/jacoco-aggregate/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.apache.cxf</groupId>
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java
index e973ffb005..bee4c88c16 100644
--- 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java
@@ -244,18 +244,14 @@ public class JAXRS20ClientServerBookTest extends 
AbstractBusClientServerTestBase
         }
 
         pool.shutdown();
-        if (pool.awaitTermination(2, TimeUnit.MINUTES)) {
-            // Since JDK-21, HttpClient Implements AutoCloseable
-            if (Runtime.version().feature() > 21) { 
-                assertThat(captureHttpClientThreads.get(), 
equalTo(httpClientThreads));
-            }
+        // Since JDK-21, HttpClient Implements AutoCloseable
+        if (pool.awaitTermination(2, TimeUnit.MINUTES) && 
Runtime.version().feature() > 21) {
+            assertThat(captureHttpClientThreads.get(), 
equalTo(httpClientThreads));
         } else {
             pool.shutdownNow();
-            if (pool.awaitTermination(2, TimeUnit.MINUTES)) {
-                // Since JDK-21, HttpClient Implements AutoCloseable
-                if (Runtime.version().feature() > 21) { 
-                    assertThat(captureHttpClientThreads.get(), 
equalTo(httpClientThreads));
-                }
+            // Since JDK-21, HttpClient Implements AutoCloseable
+            if (pool.awaitTermination(2, TimeUnit.MINUTES) && 
Runtime.version().feature() > 21) {
+                assertThat(captureHttpClientThreads.get(), 
equalTo(httpClientThreads));
             }
         }
     }