Author: ningjiang
Date: Wed May 19 13:03:40 2010
New Revision: 946167
URL: http://svn.apache.org/viewvc?rev=946167&view=rev
Log:
CAMEL-2738 changed the constant Exchange.DISABLE_STREAM_CACHE to
Exchange.DISABLE_HTTP_STREAM_CACHE
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/Exchange.java
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/CamelServlet.java
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/DefaultHttpBinding.java
camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/CamelServlet.java
camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/DefaultHttpBinding.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/Exchange.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/Exchange.java?rev=946167&r1=946166&r2=946167&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/Exchange.java
(original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/Exchange.java Wed May
19 13:03:40 2010
@@ -57,7 +57,7 @@ public interface Exchange {
String DATASET_INDEX = "CamelDataSetIndex";
String DEFAULT_CHARSET_PROPERTY = "org.apache.camel.default.charset";
- String DISABLE_STREAM_CACHE = "CamelDisableStreamCache";
+ String DISABLE_HTTP_STREAM_CACHE = "CamelDisableHttpStreamCache";
String EXCEPTION_CAUGHT = "CamelExceptionCaught";
String ERRORHANDLER_HANDLED = "CamelErrorHandlerHandled";
Modified:
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/CamelServlet.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/CamelServlet.java?rev=946167&r1=946166&r2=946167&view=diff
==============================================================================
---
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/CamelServlet.java
(original)
+++
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/CamelServlet.java
Wed May 19 13:03:40 2010
@@ -63,7 +63,7 @@ public class CamelServlet extends HttpSe
exchange.setProperty(Exchange.SKIP_GZIP_ENCODING,
Boolean.TRUE);
}
if (consumer.getEndpoint().isDisableStreamCache()) {
- exchange.setProperty(Exchange.DISABLE_STREAM_CACHE,
Boolean.TRUE);
+ exchange.setProperty(Exchange.DISABLE_HTTP_STREAM_CACHE,
Boolean.TRUE);
}
exchange.setIn(new HttpMessage(exchange, request, response));
Modified:
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/DefaultHttpBinding.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/DefaultHttpBinding.java?rev=946167&r1=946166&r2=946167&view=diff
==============================================================================
---
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/DefaultHttpBinding.java
(original)
+++
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/DefaultHttpBinding.java
Wed May 19 13:03:40 2010
@@ -314,7 +314,7 @@ public class DefaultHttpBinding implemen
return is;
}
// convert the input stream to StreamCache if the stream cache is
not disabled
- if
(httpMessage.getExchange().getProperty(Exchange.DISABLE_STREAM_CACHE,
Boolean.FALSE, Boolean.class)) {
+ if
(httpMessage.getExchange().getProperty(Exchange.DISABLE_HTTP_STREAM_CACHE,
Boolean.FALSE, Boolean.class)) {
return is;
} else {
try {
Modified:
camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/CamelServlet.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/CamelServlet.java?rev=946167&r1=946166&r2=946167&view=diff
==============================================================================
---
camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/CamelServlet.java
(original)
+++
camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/CamelServlet.java
Wed May 19 13:03:40 2010
@@ -54,7 +54,7 @@ public class CamelServlet extends HttpSe
exchange.setProperty(Exchange.SKIP_GZIP_ENCODING,
Boolean.TRUE);
}
if (consumer.getEndpoint().isDisableStreamCache()) {
- exchange.setProperty(Exchange.DISABLE_STREAM_CACHE,
Boolean.TRUE);
+ exchange.setProperty(Exchange.DISABLE_HTTP_STREAM_CACHE,
Boolean.TRUE);
}
exchange.setIn(new HttpMessage(exchange, request, response));
consumer.getProcessor().process(exchange);
Modified:
camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/DefaultHttpBinding.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/DefaultHttpBinding.java?rev=946167&r1=946166&r2=946167&view=diff
==============================================================================
---
camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/DefaultHttpBinding.java
(original)
+++
camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/DefaultHttpBinding.java
Wed May 19 13:03:40 2010
@@ -311,7 +311,7 @@ public class DefaultHttpBinding implemen
return is;
}
// convert the input stream to StreamCache if the stream cache is
not disabled
- if
(httpMessage.getExchange().getProperty(Exchange.DISABLE_STREAM_CACHE,
Boolean.FALSE, Boolean.class)) {
+ if
(httpMessage.getExchange().getProperty(Exchange.DISABLE_HTTP_STREAM_CACHE,
Boolean.FALSE, Boolean.class)) {
return is;
} else {
try {
