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 610419945 for ; Sun, 22 Apr 2012 11:34:43 +0000 (UTC) Received: (qmail 78357 invoked by uid 500); 22 Apr 2012 11:34:43 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 78296 invoked by uid 500); 22 Apr 2012 11:34:41 -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 78263 invoked by uid 99); 22 Apr 2012 11:34:40 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 22 Apr 2012 11:34:40 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 22 Apr 2012 11:34:38 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 2ABBD238896F; Sun, 22 Apr 2012 11:34:17 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1328845 - in /camel/branches/camel-2.9.x: ./ camel-core/src/main/java/org/apache/camel/processor/interceptor/StreamCaching.java Date: Sun, 22 Apr 2012 11:34:17 -0000 To: commits@camel.apache.org From: bibryam@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120422113417.2ABBD238896F@eris.apache.org> Author: bibryam Date: Sun Apr 22 11:34:16 2012 New Revision: 1328845 URL: http://svn.apache.org/viewvc?rev=1328845&view=rev Log: Merged revisions 1328843 via svnmerge from https://svn.apache.org/repos/asf/camel/trunk ........ r1328843 | bibryam | 2012-04-22 12:17:07 +0100 (Sun, 22 Apr 2012) | 1 line No relationship between generic parameter and method argument ........ Modified: camel/branches/camel-2.9.x/ (props changed) camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/processor/interceptor/StreamCaching.java Propchange: camel/branches/camel-2.9.x/ ------------------------------------------------------------------------------ Merged /camel/trunk:r1328843 Propchange: camel/branches/camel-2.9.x/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/processor/interceptor/StreamCaching.java URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/processor/interceptor/StreamCaching.java?rev=1328845&r1=1328844&r2=1328845&view=diff ============================================================================== --- camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/processor/interceptor/StreamCaching.java (original) +++ camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/processor/interceptor/StreamCaching.java Sun Apr 22 11:34:16 2012 @@ -67,7 +67,7 @@ public final class StreamCaching impleme */ public static void noStreamCaching(List interceptors) { for (InterceptStrategy strategy : interceptors) { - if (strategy instanceof StreamCachingInterceptor) { + if (strategy instanceof StreamCaching) { interceptors.remove(strategy); } }