You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2016/09/12 12:32:28 UTC

camel git commit: Revert "CAMEL-10240: Fix for thread pool sizes in CamelHttpClient"

Repository: camel
Updated Branches:
  refs/heads/camel-2.17.x d0a26dd33 -> cde385a0d


Revert "CAMEL-10240: Fix for thread pool sizes in CamelHttpClient"

This reverts commit 36275beeef9ef989b0faecfe909b4ff44bcc98af.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/cde385a0
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/cde385a0
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/cde385a0

Branch: refs/heads/camel-2.17.x
Commit: cde385a0d33e474ef25e16ebeb88b87484c994cc
Parents: d0a26dd
Author: Andrea Cosentino <an...@gmail.com>
Authored: Mon Sep 12 14:24:54 2016 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Mon Sep 12 14:24:54 2016 +0200

----------------------------------------------------------------------
 .../camel/component/jetty/CamelHttpClient.java  |  9 +++------
 .../component/jetty/JettyHttpComponent.java     | 21 ++------------------
 .../component/jetty9/CamelHttpClient9.java      |  5 -----
 .../component/jetty9/JettyHttpComponent9.java   |  5 ++---
 4 files changed, 7 insertions(+), 33 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/cde385a0/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/CamelHttpClient.java
----------------------------------------------------------------------
diff --git a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/CamelHttpClient.java b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/CamelHttpClient.java
index ab5caac..1f4504c 100644
--- a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/CamelHttpClient.java
+++ b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/CamelHttpClient.java
@@ -22,7 +22,6 @@ import javax.net.ssl.SSLContext;
 
 import org.apache.camel.util.ObjectHelper;
 import org.eclipse.jetty.client.HttpClient;
-import org.eclipse.jetty.client.HttpClientTransport;
 import org.eclipse.jetty.util.ssl.SslContextFactory;
 import org.eclipse.jetty.util.thread.QueuedThreadPool;
 
@@ -34,10 +33,6 @@ public abstract class CamelHttpClient extends HttpClient {
         super(sslContextFactory);
     }
 
-    public CamelHttpClient(HttpClientTransport transport, SslContextFactory sslContextFactory) {
-        super(transport, sslContextFactory);
-    }
-
     @Deprecated
     /**
      * It does nothing here, please setup SslContextFactory directly, it will be removed in Camel 2.16.0
@@ -50,8 +45,10 @@ public abstract class CamelHttpClient extends HttpClient {
     @Override
     protected void doStart() throws Exception {
         if (!hasThreadPool()) {
-            // if there is no thread pool then create a default thread pool using daemon threads with default size (200)
+            // if there is no thread pool then create a default thread pool using daemon threads
             QueuedThreadPool qtp = new QueuedThreadPool();
+            // 16 max threads is the default in the http client
+            qtp.setMaxThreads(16);
             qtp.setDaemon(true);
             // let the thread names indicate they are from the client
             qtp.setName("CamelJettyClient(" + ObjectHelper.getIdentityHashCode(this) + ")");

http://git-wip-us.apache.org/repos/asf/camel/blob/cde385a0/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
index 26fe102..33fe88c 100644
--- a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
+++ b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
@@ -63,8 +63,6 @@ import org.apache.camel.util.URISupport;
 import org.apache.camel.util.UnsafeUriCharactersEncoder;
 import org.apache.camel.util.jsse.SSLContextParameters;
 import org.eclipse.jetty.client.HttpClient;
-import org.eclipse.jetty.client.HttpClientTransport;
-import org.eclipse.jetty.client.http.HttpClientTransportOverHTTP;
 import org.eclipse.jetty.http.HttpStatus;
 import org.eclipse.jetty.jmx.MBeanContainer;
 import org.eclipse.jetty.server.AbstractConnector;
@@ -654,8 +652,7 @@ public abstract class JettyHttpComponent extends HttpCommonComponent implements
      */
     public CamelHttpClient createHttpClient(JettyHttpEndpoint endpoint, Integer minThreads, Integer maxThreads, SSLContextParameters ssl) throws Exception {
         SslContextFactory sslContextFactory = createSslContextFactory(ssl);
-        HttpClientTransport transport = createHttpClientTransport(maxThreads);
-        CamelHttpClient httpClient = createCamelHttpClient(transport, sslContextFactory);
+        CamelHttpClient httpClient = createCamelHttpClient(sslContextFactory);
         
         CamelContext context = endpoint.getCamelContext();
 
@@ -705,21 +702,7 @@ public abstract class JettyHttpComponent extends HttpCommonComponent implements
         return httpClient;
     }
 
-    private HttpClientTransport createHttpClientTransport(Integer maxThreads) {
-        if (maxThreads == null) {
-            return new HttpClientTransportOverHTTP();
-        }
-
-        int selectors = Runtime.getRuntime().availableProcessors() / 2;
-
-        if (selectors >= maxThreads) {
-            selectors = maxThreads - 1;
-        }
-
-        return new HttpClientTransportOverHTTP(selectors);
-    }
-
-    protected abstract CamelHttpClient createCamelHttpClient(HttpClientTransport transport, SslContextFactory sslContextFactory);
+    protected abstract CamelHttpClient createCamelHttpClient(SslContextFactory sslContextFactory);
 
     public Integer getHttpClientMinThreads() {
         return httpClientMinThreads;

http://git-wip-us.apache.org/repos/asf/camel/blob/cde385a0/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/CamelHttpClient9.java
----------------------------------------------------------------------
diff --git a/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/CamelHttpClient9.java b/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/CamelHttpClient9.java
index bb29eaf..001662f 100644
--- a/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/CamelHttpClient9.java
+++ b/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/CamelHttpClient9.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.jetty9;
 import java.util.concurrent.Executor;
 
 import org.apache.camel.component.jetty.CamelHttpClient;
-import org.eclipse.jetty.client.HttpClientTransport;
 import org.eclipse.jetty.util.ssl.SslContextFactory;
 
 public class CamelHttpClient9 extends CamelHttpClient {
@@ -28,10 +27,6 @@ public class CamelHttpClient9 extends CamelHttpClient {
         super(sslContextFactory);
     }
 
-    public CamelHttpClient9(HttpClientTransport transport, SslContextFactory sslContextFactory) {
-        super(transport, sslContextFactory);
-    }
-
     protected boolean hasThreadPool() {
         return getExecutor() != null;
     }

http://git-wip-us.apache.org/repos/asf/camel/blob/cde385a0/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/JettyHttpComponent9.java
----------------------------------------------------------------------
diff --git a/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/JettyHttpComponent9.java b/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/JettyHttpComponent9.java
index 8e93a2e..66a49cf 100644
--- a/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/JettyHttpComponent9.java
+++ b/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/JettyHttpComponent9.java
@@ -27,7 +27,6 @@ import org.apache.camel.component.jetty.JettyHttpComponent;
 import org.apache.camel.component.jetty.JettyHttpEndpoint;
 import org.apache.camel.util.IntrospectionSupport;
 import org.apache.camel.util.ObjectHelper;
-import org.eclipse.jetty.client.HttpClientTransport;
 import org.eclipse.jetty.server.AbstractConnector;
 import org.eclipse.jetty.server.ConnectionFactory;
 import org.eclipse.jetty.server.Connector;
@@ -39,8 +38,8 @@ import org.eclipse.jetty.util.ssl.SslContextFactory;
 
 public class JettyHttpComponent9 extends JettyHttpComponent {
 
-    protected CamelHttpClient createCamelHttpClient(HttpClientTransport transport, SslContextFactory sslContextFactory) {
-        return new CamelHttpClient9(transport, sslContextFactory);
+    protected CamelHttpClient createCamelHttpClient(SslContextFactory sslContextFactory) {
+        return new CamelHttpClient9(sslContextFactory);
     }
 
     protected JettyHttpEndpoint createEndpoint(URI endpointUri, URI httpUri) throws URISyntaxException {