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

[1/4] camel git commit: Transfer shutdown to component as the workerPool might be shared between several producer

Repository: camel
Updated Branches:
  refs/heads/ftpfix [created] 9ffbfc489


Transfer shutdown to component as the workerPool might be shared between
several producer

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

Branch: refs/heads/ftpfix
Commit: 2e1dd68e09efa937121bee6200466bdf0abcadbc
Parents: dfb1083
Author: Jean-Yves BESSON <je...@external.partecis.eu>
Authored: Mon Sep 5 11:08:13 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Sep 7 09:21:32 2016 +0200

----------------------------------------------------------------------
 .../java/org/apache/camel/component/netty4/NettyComponent.java  | 5 +++++
 1 file changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/2e1dd68e/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyComponent.java b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyComponent.java
index 601f952..33b814e 100644
--- a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyComponent.java
+++ b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyComponent.java
@@ -157,6 +157,11 @@ public class NettyComponent extends UriEndpointComponent {
             executorService = null;
         }
 
+        //shutdown workerPool if configured
+        if (configuration.getWorkerGroup() != null) {
+            configuration.getWorkerGroup().shutdownGracefully();
+        }
+               
         super.doStop();
     }
 


[3/4] camel git commit: Fixed CS. This closes #1157. This closes #1155.

Posted by da...@apache.org.
Fixed CS. This closes #1157. This closes #1155.


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

Branch: refs/heads/ftpfix
Commit: 4d4b5bcb50433750b53f40a7857f96cf1b146c75
Parents: 2e1dd68
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Sep 7 09:24:49 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Sep 7 09:24:49 2016 +0200

----------------------------------------------------------------------
 .../jetty/rest/producer/JettyRestProducerPojoInOutTest.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/4d4b5bcb/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/rest/producer/JettyRestProducerPojoInOutTest.java
----------------------------------------------------------------------
diff --git a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/rest/producer/JettyRestProducerPojoInOutTest.java b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/rest/producer/JettyRestProducerPojoInOutTest.java
index a0fae86..fed8821 100644
--- a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/rest/producer/JettyRestProducerPojoInOutTest.java
+++ b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/rest/producer/JettyRestProducerPojoInOutTest.java
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.


[4/4] camel git commit: Downloaded FTP file should be easy to read as an InputStream instead of OutputStream.

Posted by da...@apache.org.
Downloaded FTP file should be easy to read as an InputStream instead of OutputStream.


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

Branch: refs/heads/ftpfix
Commit: 9ffbfc489b2e4a2cd2d4f1b42c51b766fc570573
Parents: 4d4b5bc
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Sep 7 09:42:12 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Sep 7 09:42:12 2016 +0200

----------------------------------------------------------------------
 .../camel/component/file/remote/FtpOperations.java | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/9ffbfc48/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
----------------------------------------------------------------------
diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
index cfc72f7..db58a9c 100644
--- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
+++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
@@ -325,7 +325,7 @@ public class FtpOperations implements RemoteFileOperations<FTPFile> {
         
         if (is != null) {
             try {
-                is.close();
+                IOHelper.close(is);
                 client.completePendingCommand();
             } catch (IOException e) {
                 throw new GenericFileOperationFailedException(e.getMessage(), e);
@@ -335,7 +335,6 @@ public class FtpOperations implements RemoteFileOperations<FTPFile> {
 
     @SuppressWarnings("unchecked")
     private boolean retrieveFileToStreamInBody(String name, Exchange exchange) throws GenericFileOperationFailedException {
-        OutputStream os = null;
         boolean result;
         try {
             GenericFile<FTPFile> target = (GenericFile<FTPFile>) exchange.getProperty(FileComponent.FILE_EXCHANGE_FILE);
@@ -365,9 +364,15 @@ public class FtpOperations implements RemoteFileOperations<FTPFile> {
                 exchange.getIn().setHeader(RemoteFileComponent.REMOTE_FILE_INPUT_STREAM, is);
                 result = true;
             } else {
-                os = new ByteArrayOutputStream();
-                target.setBody(os);
-                result = client.retrieveFile(remoteName, os);
+                // read the entire file into memory in the byte array
+                ByteArrayOutputStream bos = new ByteArrayOutputStream();
+                result = client.retrieveFile(remoteName, bos);
+                // close the stream after done
+                IOHelper.close(bos);
+
+                // and then set the body as an input stream so we can read the content easily
+                InputStream is = new ByteArrayInputStream(bos.toByteArray());
+                target.setBody(is);
             }
 
             // store client reply information after the operation
@@ -381,8 +386,6 @@ public class FtpOperations implements RemoteFileOperations<FTPFile> {
 
         } catch (IOException e) {
             throw new GenericFileOperationFailedException(client.getReplyCode(), client.getReplyString(), e.getMessage(), e);
-        } finally {
-            IOHelper.close(os, "retrieve: " + name, log);
         }
 
         return result;


[2/4] camel git commit: CAMEL-10240: Fix for thread pool sizes in CamelHttpClient

Posted by da...@apache.org.
CAMEL-10240: Fix for thread pool sizes in CamelHttpClient


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

Branch: refs/heads/ftpfix
Commit: dfb1083b2a0e13436a18b35e93b84b5de37087db
Parents: 66d050f
Author: Tomasz Kopczynski <to...@kopczynski.net.pl>
Authored: Mon Sep 5 20:55:04 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Sep 7 09:21:32 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, 33 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/dfb1083b/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 1f4504c..ab5caac 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,6 +22,7 @@ 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;
 
@@ -33,6 +34,10 @@ 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
@@ -45,10 +50,8 @@ 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
+            // if there is no thread pool then create a default thread pool using daemon threads with default size (200)
             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/dfb1083b/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 70583c8..260e2bb 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
@@ -67,6 +67,8 @@ 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;
@@ -663,7 +665,8 @@ public abstract class JettyHttpComponent extends HttpCommonComponent implements
      */
     public CamelHttpClient createHttpClient(JettyHttpEndpoint endpoint, Integer minThreads, Integer maxThreads, SSLContextParameters ssl) throws Exception {
         SslContextFactory sslContextFactory = createSslContextFactory(ssl);
-        CamelHttpClient httpClient = createCamelHttpClient(sslContextFactory);
+        HttpClientTransport transport = createHttpClientTransport(maxThreads);
+        CamelHttpClient httpClient = createCamelHttpClient(transport, sslContextFactory);
         
         CamelContext context = endpoint.getCamelContext();
 
@@ -713,7 +716,21 @@ public abstract class JettyHttpComponent extends HttpCommonComponent implements
         return httpClient;
     }
 
-    protected abstract CamelHttpClient createCamelHttpClient(SslContextFactory sslContextFactory);
+    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);
 
     public Integer getHttpClientMinThreads() {
         return httpClientMinThreads;

http://git-wip-us.apache.org/repos/asf/camel/blob/dfb1083b/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 001662f..bb29eaf 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,6 +19,7 @@ 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 {
@@ -27,6 +28,10 @@ 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/dfb1083b/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 0b2177f..995dc78 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,6 +27,7 @@ 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 +40,8 @@ import org.eclipse.jetty.util.ssl.SslContextFactory;
 
 public class JettyHttpComponent9 extends JettyHttpComponent {
 
-    protected CamelHttpClient createCamelHttpClient(SslContextFactory sslContextFactory) {
-        return new CamelHttpClient9(sslContextFactory);
+    protected CamelHttpClient createCamelHttpClient(HttpClientTransport transport, SslContextFactory sslContextFactory) {
+        return new CamelHttpClient9(transport, sslContextFactory);
     }
 
     protected JettyHttpEndpoint createEndpoint(URI endpointUri, URI httpUri) throws URISyntaxException {