Updated Branches:
  refs/heads/camel-2.12.x 0da8635a5 -> 39354f96d
  refs/heads/master 78ab9c1ba -> 34f4174b1


CAMEL-6705: DefaultStreamCachingStrategy - Check for enabled in 
shouldSpoolCache method


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

Branch: refs/heads/master
Commit: 34f4174b192477c70a1dca93a320fe3e1d5a5d21
Parents: 78ab9c1
Author: Claus Ibsen <davscl...@apache.org>
Authored: Wed Sep 4 11:35:01 2013 +0200
Committer: Claus Ibsen <davscl...@apache.org>
Committed: Wed Sep 4 11:35:01 2013 +0200

----------------------------------------------------------------------
 .../java/org/apache/camel/impl/DefaultStreamCachingStrategy.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/34f4174b/camel-core/src/main/java/org/apache/camel/impl/DefaultStreamCachingStrategy.java
----------------------------------------------------------------------
diff --git 
a/camel-core/src/main/java/org/apache/camel/impl/DefaultStreamCachingStrategy.java
 
b/camel-core/src/main/java/org/apache/camel/impl/DefaultStreamCachingStrategy.java
index fc833de..dd121e4 100644
--- 
a/camel-core/src/main/java/org/apache/camel/impl/DefaultStreamCachingStrategy.java
+++ 
b/camel-core/src/main/java/org/apache/camel/impl/DefaultStreamCachingStrategy.java
@@ -153,7 +153,7 @@ public class DefaultStreamCachingStrategy extends 
org.apache.camel.support.Servi
     }
 
     public boolean shouldSpoolCache(long length) {
-        if (spoolRules.isEmpty()) {
+        if (!enabled || spoolRules.isEmpty()) {
             return false;
         }
 

Reply via email to