This is an automated email from the ASF dual-hosted git repository. dkulp pushed a commit to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git
commit ca4753067f489ce45a300ad7e462883a8dc377b7 Author: Daniel Kulp <[email protected]> AuthorDate: Tue Jun 13 13:39:28 2023 -0400 Fix checkstyle --- .../cxf/transport/http/HttpClientHTTPConduit.java | 5 +---- .../cxf/systest/jaxws/JaxWsClientThreadTest.java | 18 +++++++++--------- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java index af7c81b2ec..f836903431 100644 --- a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java +++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java @@ -25,7 +25,6 @@ import java.io.OutputStream; import java.io.PipedInputStream; import java.io.PipedOutputStream; import java.io.PushbackInputStream; -import java.lang.reflect.InvocationTargetException; import java.net.ConnectException; import java.net.HttpURLConnection; import java.net.MalformedURLException; @@ -34,7 +33,6 @@ import java.net.ProxySelector; import java.net.SocketAddress; import java.net.URI; import java.net.URISyntaxException; -import java.net.URLConnection; import java.net.UnknownHostException; import java.net.http.HttpClient; import java.net.http.HttpClient.Redirect; @@ -73,7 +71,6 @@ import javax.net.ssl.SSLSession; import org.apache.cxf.Bus; import org.apache.cxf.common.util.PropertyUtils; -import org.apache.cxf.common.util.ReflectionUtil; import org.apache.cxf.configuration.jsse.TLSClientParameters; import org.apache.cxf.helpers.HttpHeaderHelper; import org.apache.cxf.helpers.JavaUtils; @@ -137,7 +134,7 @@ public class HttpClientHTTPConduit extends URLConnectionHTTPConduit { } try { ThreadGroup rootGroup = Thread.currentThread().getThreadGroup(); - Thread threads[] = new Thread[rootGroup.activeCount()]; + Thread[] threads = new Thread[rootGroup.activeCount()]; int cnt = rootGroup.enumerate(threads); for (int x = 0; x < cnt; x++) { if (threads[x].getName().contains(n)) { diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/JaxWsClientThreadTest.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/JaxWsClientThreadTest.java index e853b0bf11..f5ef046053 100644 --- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/JaxWsClientThreadTest.java +++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/JaxWsClientThreadTest.java @@ -224,7 +224,7 @@ public class JaxWsClientThreadTest extends AbstractCXFTest { public void testMultiGreeterThreadSafety() throws Throwable { URL url = getClass().getResource("/wsdl/hello_world.wsdl"); - final jakarta.xml.ws.Service s = jakarta.xml.ws.Service.create(url, serviceName); + final javax.xml.ws.Service s = javax.xml.ws.Service.create(url, serviceName); final int numThreads = 50; final Throwable[] errorHolder = new Throwable[numThreads]; @@ -237,15 +237,15 @@ public class JaxWsClientThreadTest extends AbstractCXFTest { int start = rootGroup.activeCount(); Thread[] threads = new Thread[numThreads]; - for (int i = 0; i < numThreads; i++) { - final int tid = i; + for (int t = 0; t < numThreads; t++) { + final int tid = t; Runnable r = new Runnable() { public void run() { final Greeter greeter = s.getPort(portName, Greeter.class); - try (AutoCloseable c = (AutoCloseable)greeter){ + try (AutoCloseable c = (AutoCloseable)greeter) { final InvocationHandler handler = Proxy.getInvocationHandler(greeter); - Map<String, Object> requestContext = ((BindingProvider)handler).getRequestContext(); - + Map<String, Object> requestContext = ((BindingProvider)handler).getRequestContext(); + final String protocol = "http-" + Thread.currentThread().getId(); for (int i = 0; i < 10; i++) { String threadSpecificaddress = protocol + "://localhost:80/" + i; @@ -277,7 +277,7 @@ public class JaxWsClientThreadTest extends AbstractCXFTest { } } }; - threads[i] = new Thread(r); + threads[t] = new Thread(r); } for (int i = 0; i < numThreads; i++) { threads[i].start(); @@ -301,8 +301,8 @@ public class JaxWsClientThreadTest extends AbstractCXFTest { System.out.println("Start: " + start + " End: " + end); - // we'll allow a few extra threads to be created for various things like GC, but we definitely shouldn't be anywhere - // near numThreads of extra threads + // we'll allow a few extra threads to be created for various things like GC, but we + // definitely shouldn't be anywhere near numThreads of extra threads assertTrue("Too many extra trheads created " + end + "/" + start, (end - start) < 5); }
