Author: bibryam Date: Sun Apr 22 11:40:37 2012 New Revision: 1328848 URL: http://svn.apache.org/viewvc?rev=1328848&view=rev Log: Merged revisions 1328845 via svnmerge from https://svn.apache.org/repos/asf/camel/branches/camel-2.9.x
................ r1328845 | bibryam | 2012-04-22 12:34:16 +0100 (Sun, 22 Apr 2012) | 9 lines 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.8.x/ (props changed) camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/processor/interceptor/StreamCaching.java Propchange: camel/branches/camel-2.8.x/ ------------------------------------------------------------------------------ Merged /camel/trunk:r1328843 Merged /camel/branches/camel-2.9.x:r1328845 Propchange: camel/branches/camel-2.8.x/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/processor/interceptor/StreamCaching.java URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/processor/interceptor/StreamCaching.java?rev=1328848&r1=1328847&r2=1328848&view=diff ============================================================================== --- camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/processor/interceptor/StreamCaching.java (original) +++ camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/processor/interceptor/StreamCaching.java Sun Apr 22 11:40:37 2012 @@ -67,7 +67,7 @@ public final class StreamCaching impleme */ public static void noStreamCaching(List<InterceptStrategy> interceptors) { for (InterceptStrategy strategy : interceptors) { - if (strategy instanceof StreamCachingInterceptor) { + if (strategy instanceof StreamCaching) { interceptors.remove(strategy); } }
