Return-Path: X-Original-To: apmail-camel-commits-archive@www.apache.org Delivered-To: apmail-camel-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id EC278179F9 for ; Sun, 28 Sep 2014 03:01:40 +0000 (UTC) Received: (qmail 51030 invoked by uid 500); 28 Sep 2014 03:01:40 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 50985 invoked by uid 500); 28 Sep 2014 03:01:40 -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 50975 invoked by uid 99); 28 Sep 2014 03:01:40 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 28 Sep 2014 03:01:40 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 417A79B7F14; Sun, 28 Sep 2014 03:01:40 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ningjiang@apache.org To: commits@camel.apache.org Date: Sun, 28 Sep 2014 03:01:40 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/2] git commit: CAMEL-7856 Fixed the test error with JDK7 Repository: camel Updated Branches: refs/heads/camel-2.12.x 01136bfcc -> daeb5595b refs/heads/camel-2.14.x ce90e4379 -> fbc22e54c CAMEL-7856 Fixed the test error with JDK7 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fbc22e54 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fbc22e54 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fbc22e54 Branch: refs/heads/camel-2.14.x Commit: fbc22e54cabe120ab497be5949cdbaeb9d2f3a51 Parents: ce90e43 Author: Willem Jiang Authored: Sun Sep 28 10:59:39 2014 +0800 Committer: Willem Jiang Committed: Sun Sep 28 11:00:46 2014 +0800 ---------------------------------------------------------------------- .../org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java | 4 ++-- .../org/apache/camel/component/cxf/jaxrs/CxfRsSpringRouter.xml | 4 ++-- .../camel/component/cxf/jaxrs/JettyCxfRsSpringRouter.xml | 6 +----- 3 files changed, 5 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/fbc22e54/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java index 1a04617..8e7eca0 100644 --- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java +++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java @@ -406,8 +406,8 @@ public class CxfRsEndpoint extends DefaultEndpoint implements HeaderFilterStrate return ignoreDeleteMethodMessageBody; } - public void setIgnoreDELETEMethodMessageBody(boolean ignoreDELETEMethodMessageBody) { - this.ignoreDeleteMethodMessageBody = ignoreDELETEMethodMessageBody; + public void setIgnoreDeleteMethodMessageBody(boolean ignoreDeleteMethodMessageBody) { + this.ignoreDeleteMethodMessageBody = ignoreDeleteMethodMessageBody; } public BindingStyle getBindingStyle() { http://git-wip-us.apache.org/repos/asf/camel/blob/fbc22e54/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfRsSpringRouter.xml ---------------------------------------------------------------------- diff --git a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfRsSpringRouter.xml b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfRsSpringRouter.xml index 172aac1..52d9d7f 100644 --- a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfRsSpringRouter.xml +++ b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfRsSpringRouter.xml @@ -64,9 +64,9 @@ - + - + http://git-wip-us.apache.org/repos/asf/camel/blob/fbc22e54/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/JettyCxfRsSpringRouter.xml ---------------------------------------------------------------------- diff --git a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/JettyCxfRsSpringRouter.xml b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/JettyCxfRsSpringRouter.xml index 074bf89..0a2adce 100644 --- a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/JettyCxfRsSpringRouter.xml +++ b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/JettyCxfRsSpringRouter.xml @@ -52,11 +52,7 @@ - - - True - - +