Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 08877200BDB for ; Mon, 12 Dec 2016 10:18:19 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 07228160B22; Mon, 12 Dec 2016 09:18:19 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 5981B160B30 for ; Mon, 12 Dec 2016 10:18:18 +0100 (CET) Received: (qmail 59242 invoked by uid 500); 12 Dec 2016 09:18:17 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 59002 invoked by uid 99); 12 Dec 2016 09:18:17 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 12 Dec 2016 09:18:17 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 48AF3EEE2A; Mon, 12 Dec 2016 09:18:17 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: davsclaus@apache.org To: commits@camel.apache.org Date: Mon, 12 Dec 2016 09:18:21 -0000 Message-Id: <11d2b54482654817bf1c3556c7c901ee@git.apache.org> In-Reply-To: <3b794bfc73194709b4e88d7aa0762208@git.apache.org> References: <3b794bfc73194709b4e88d7aa0762208@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [5/5] camel git commit: Fixed CS. This closes #1339 archived-at: Mon, 12 Dec 2016 09:18:19 -0000 Fixed CS. This closes #1339 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a5771f5a Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a5771f5a Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a5771f5a Branch: refs/heads/master Commit: a5771f5a8e2755e237e74df1eb3aeb0466d84212 Parents: 2cc56e9 Author: Claus Ibsen Authored: Mon Dec 12 10:17:24 2016 +0100 Committer: Claus Ibsen Committed: Mon Dec 12 10:17:24 2016 +0100 ---------------------------------------------------------------------- .../org/apache/camel/component/servlet/ServletComponent.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/a5771f5a/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletComponent.java b/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletComponent.java index a04cf5a..6163b56 100644 --- a/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletComponent.java +++ b/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletComponent.java @@ -135,11 +135,12 @@ public class ServletComponent extends HttpCommonComponent implements RestConsume // turn off stream caching if in attachment mode if (endpoint.isAttachmentMultipartBinding()) { if (disableStreamCache == null) { - // disableStreamCache not explict configured so we can automatic change it + // disableStreamCache not explicit configured so we can automatic change it LOG.info("Disabling stream caching as attachmentMultipartBinding is enabled"); endpoint.setDisableStreamCache(true); } else if (!disableStreamCache) { - throw new IllegalArgumentException("The options attachmentMultipartBinding=true and disableStreamCache=false cannot work together. Remove disableStreamCache to use AttachmentMultipartBinding"); + throw new IllegalArgumentException("The options attachmentMultipartBinding=true and disableStreamCache=false cannot work together." + + " Remove disableStreamCache to use AttachmentMultipartBinding"); } }