You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2009/04/28 18:15:38 UTC
svn commit: r769448 - in /camel/trunk:
camel-core/src/main/java/org/apache/camel/
camel-core/src/main/java/org/apache/camel/builder/
camel-core/src/main/java/org/apache/camel/builder/xml/
camel-core/src/main/java/org/apache/camel/component/bean/ camel-...
Author: davsclaus
Date: Tue Apr 28 16:15:35 2009
New Revision: 769448
URL: http://svn.apache.org/viewvc?rev=769448&view=rev
Log:
CAMEL-1563: Added hasOut, hasFault for testing whether an out exists. @deprecated getOut(boolean).
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/Exchange.java
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/MessageVariableResolver.java
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/CamelInvocationHandler.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/log/LogFormatter.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultConsumerTemplate.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchangeHolder.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultProducerTemplate.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultScheduledPollConsumer.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/InterceptEndpoint.java
camel/trunk/camel-core/src/main/java/org/apache/camel/language/bean/BeanExpression.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MarshalProcessor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Pipeline.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/UnmarshalProcessor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DebugInterceptor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultTraceEventMessage.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultTraceFormatter.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/HandleFaultInterceptor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanPipelineTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/direct/DirectNoToTypeTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/FaultRouteTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/PipelineTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/UnitOfWorkTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/enricher/EnricherTest.java
camel/trunk/components/camel-freemarker/src/main/java/org/apache/camel/component/freemarker/FreemarkerEndpoint.java
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/DefaultHttpBinding.java
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java
camel/trunk/components/camel-ibatis/src/main/java/org/apache/camel/component/ibatis/IBatisProducer.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ExplicitHttpsRouteTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpClientRouteTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpRouteTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteSetupWithSystemPropsTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpGetWithParamTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyRouteTest.java
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/EndpointMessageListener.java
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteRequestReplyTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSimpleRequestCustomReplyToTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/QueueToQueueRequestReplyTransactionTest.java
camel/trunk/components/camel-juel/src/main/java/org/apache/camel/language/juel/JuelExpression.java
camel/trunk/components/camel-mvel/src/test/java/org/apache/camel/language/mvel/MvelTest.java
camel/trunk/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/OgnlTest.java
camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java
camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java
camel/trunk/components/camel-stringtemplate/src/main/java/org/apache/camel/component/stringtemplate/StringTemplateEndpoint.java
camel/trunk/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityEndpoint.java
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/ExchangeResource.java
camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/queue/version/BankResponseAggregationStrategy.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=769448&r1=769447&r2=769448&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 Tue Apr 28 16:15:35 2009
@@ -153,17 +153,27 @@
* been associated with this exchange. If you want to inspect this property
* but not force lazy creation then invoke the {@link #getOut(boolean)}
* method passing in <tt>false</tt>
+ * <p/>
+ * If you want to test whether an OUT message have been set or not, use the {@link #hasOut()} method.
*
* @return the response
*/
Message getOut();
/**
+ * Returns whether an OUT message has been set or not.
+ *
+ * @return <tt>true</tt> if an OUT message exists, <tt>false</tt> otherwise.
+ */
+ boolean hasOut();
+
+ /**
* Returns the outbound message; optionally lazily creating one if one has
* not been associated with this exchange
*
* @param lazyCreate <tt>true</tt> will lazy create the out message
* @return the response
+ * @deprecated use {@link #hasOut()} or {@link #getOut()}. Will be remove in Camel 2.0 GA.
*/
Message getOut(boolean lazyCreate);
@@ -182,11 +192,19 @@
Message getFault();
/**
+ * Returns whether a FAULT message has been set or not.
+ *
+ * @return <tt>true</tt> if a FAULT message exists, <tt>false</tt> otherwise.
+ */
+ boolean hasFault();
+
+ /**
* Returns the fault message; optionally lazily creating one if one has
* not been associated with this exchange
*
* @param lazyCreate <tt>true</tt> will lazy create the fault message
* @return the fault
+ * @deprecated use {@link #hasFault()} or {@link #getFault()}. Will be remove in Camel 2.0 GA.
*/
Message getFault(boolean lazyCreate);
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java?rev=769448&r1=769447&r2=769448&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java Tue Apr 28 16:15:35 2009
@@ -100,10 +100,11 @@
public static Expression outHeaderExpression(final String headerName) {
return new ExpressionAdapter() {
public Object evaluate(Exchange exchange) {
- Message out = exchange.getOut(false);
- if (out == null) {
+ if (!exchange.hasOut()) {
return null;
}
+
+ Message out = exchange.getOut();
Object header = out.getHeader(headerName);
if (header == null) {
// lets try the exchange header
@@ -380,11 +381,11 @@
public static Expression outBodyExpression() {
return new ExpressionAdapter() {
public Object evaluate(Exchange exchange) {
- Message out = exchange.getOut(false);
- if (out == null) {
+ if (exchange.hasOut()) {
+ return exchange.getOut().getBody();
+ } else {
return null;
}
- return out.getBody();
}
@Override
@@ -401,11 +402,11 @@
public static <T> Expression outBodyExpression(final Class<T> type) {
return new ExpressionAdapter() {
public Object evaluate(Exchange exchange) {
- Message out = exchange.getOut(false);
- if (out == null) {
+ if (exchange.hasOut()) {
+ return exchange.getOut().getBody(type);
+ } else {
return null;
}
- return out.getBody(type);
}
@Override
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/MessageVariableResolver.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/MessageVariableResolver.java?rev=769448&r1=769447&r2=769448&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/MessageVariableResolver.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/MessageVariableResolver.java Tue Apr 28 16:15:35 2009
@@ -88,8 +88,8 @@
answer = in.getBody();
}
} else if (uri.equals(OUT_NAMESPACE)) {
- Message out = exchange.getOut(false);
- if (out != null) {
+ if (exchange.hasOut()) {
+ Message out = exchange.getOut();
answer = out.getHeader(localPart);
if (answer == null && localPart.equals("body")) {
answer = out.getBody();
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java?rev=769448&r1=769447&r2=769448&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java Tue Apr 28 16:15:35 2009
@@ -362,11 +362,8 @@
if (outBodyFunction == null) {
outBodyFunction = new XPathFunction() {
public Object evaluate(List list) throws XPathFunctionException {
- if (exchange != null) {
- Message out = exchange.getOut(false);
- if (out != null) {
- return out.getBody();
- }
+ if (exchange != null && exchange.hasOut()) {
+ return exchange.getOut().getBody();
}
return null;
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java?rev=769448&r1=769447&r2=769448&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java Tue Apr 28 16:15:35 2009
@@ -76,7 +76,7 @@
Result result = resultHandler.getResult();
// lets copy the headers before we invoke the transform in case they modify them
- Message out = exchange.getOut(true);
+ Message out = exchange.getOut();
out.copyFrom(exchange.getIn());
transformer.transform(source, result);
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java?rev=769448&r1=769447&r2=769448&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java Tue Apr 28 16:15:35 2009
@@ -115,7 +115,7 @@
if (LOG.isDebugEnabled()) {
LOG.debug("Setting bean invocation result on the OUT message: " + value);
}
- exchange.getOut(true).setBody(value);
+ exchange.getOut().setBody(value);
// propagate headers
exchange.getOut().getHeaders().putAll(exchange.getIn().getHeaders());
} else {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/CamelInvocationHandler.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/CamelInvocationHandler.java?rev=769448&r1=769447&r2=769448&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/CamelInvocationHandler.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/CamelInvocationHandler.java Tue Apr 28 16:15:35 2009
@@ -59,7 +59,7 @@
throw new InvocationTargetException(fault);
}
if (pattern.isOutCapable()) {
- return exchange.getOut(true).getBody();
+ return exchange.getOut().getBody();
} else {
return null;
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/log/LogFormatter.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/log/LogFormatter.java?rev=769448&r1=769447&r2=769448&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/log/LogFormatter.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/log/LogFormatter.java Tue Apr 28 16:15:35 2009
@@ -72,9 +72,9 @@
sb.append(", Body:").append(getBodyAsString(in));
}
- Message out = exchange.getOut(false);
if (showAll || showOut) {
- if (out != null) {
+ if (exchange.hasOut()) {
+ Message out = exchange.getOut();
if (showAll || showHeaders) {
if (multiline) {
sb.append('\n');
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultConsumerTemplate.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultConsumerTemplate.java?rev=769448&r1=769447&r2=769448&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultConsumerTemplate.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultConsumerTemplate.java Tue Apr 28 16:15:35 2009
@@ -152,8 +152,7 @@
}
// okay no fault then return the response
- boolean hasOut = result.getOut(false) != null;
- if (hasOut) {
+ if (result.hasOut()) {
// use OUT as the response
answer = result.getOut().getBody();
} else {
@@ -165,11 +164,13 @@
}
protected boolean hasFaultMessage(Exchange result) {
- Message faultMessage = result.getFault(false);
- if (faultMessage != null) {
- Object faultBody = faultMessage.getBody();
- if (faultBody != null) {
- return true;
+ if (result.hasFault()) {
+ Message faultMessage = result.getFault();
+ if (faultMessage != null) {
+ Object faultBody = faultMessage.getBody();
+ if (faultBody != null) {
+ return true;
+ }
}
}
return false;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java?rev=769448&r1=769447&r2=769448&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java Tue Apr 28 16:15:35 2009
@@ -102,13 +102,11 @@
// this can cause strangeness if we copy, say, a FileMessage onto an FtpExchange with overloaded getExchange() methods etc.
safeCopy(getIn(), exchange.getIn());
- Message copyOut = exchange.getOut(false);
- if (copyOut != null) {
- safeCopy(getOut(true), copyOut);
- }
- Message copyFault = exchange.getFault(false);
- if (copyFault != null) {
- safeCopy(getFault(true), copyFault);
+ if (exchange.hasOut()) {
+ safeCopy(getOut(), exchange.getOut());
+ }
+ if (exchange.hasFault()) {
+ safeCopy(getFault(), exchange.getFault());
}
setException(exchange.getException());
@@ -216,7 +214,15 @@
}
public Message getOut() {
- return getOut(true);
+ if (out == null) {
+ out = createOutMessage();
+ configureMessage(out);
+ }
+ return out;
+ }
+
+ public boolean hasOut() {
+ return out != null;
}
public Message getOut(boolean lazyCreate) {
@@ -273,7 +279,15 @@
}
public Message getFault() {
- return getFault(true);
+ if (fault == null) {
+ fault = createFaultMessage();
+ configureMessage(fault);
+ }
+ return fault;
+ }
+
+ public boolean hasFault() {
+ return fault != null;
}
public Message getFault(boolean lazyCreate) {
@@ -305,9 +319,8 @@
}
public boolean isFailed() {
- Message faultMessage = getFault(false);
- if (faultMessage != null) {
- Object faultBody = faultMessage.getBody();
+ if (hasFault()) {
+ Object faultBody = getFault().getBody();
if (faultBody != null) {
return true;
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchangeHolder.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchangeHolder.java?rev=769448&r1=769447&r2=769448&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchangeHolder.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchangeHolder.java Tue Apr 28 16:15:35 2009
@@ -70,11 +70,11 @@
payload.inBody = checkSerializableObject("in body", exchange, exchange.getIn().getBody());
payload.inHeaders.putAll(checkMapSerializableObjects("in headers", exchange, exchange.getIn().getHeaders()));
- if (exchange.getOut(false) != null) {
+ if (exchange.hasOut()) {
payload.outBody = checkSerializableObject("out body", exchange, exchange.getOut().getBody());
payload.outHeaders.putAll(checkMapSerializableObjects("out headers", exchange, exchange.getOut().getHeaders()));
}
- if (exchange.getFault(false) != null) {
+ if (exchange.hasFault()) {
payload.faultBody = checkSerializableObject("fault body", exchange, exchange.getFault().getBody());
payload.faultHeaders.putAll(checkMapSerializableObjects("fault headers", exchange, exchange.getFault().getHeaders()));
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultProducerTemplate.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultProducerTemplate.java?rev=769448&r1=769447&r2=769448&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultProducerTemplate.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultProducerTemplate.java Tue Apr 28 16:15:35 2009
@@ -489,7 +489,7 @@
// okay no fault then return the response according to the pattern
// try to honor pattern if provided
boolean notOut = pattern != null && !pattern.isOutCapable();
- boolean hasOut = result.getOut(false) != null;
+ boolean hasOut = result.hasOut();
if (hasOut && !notOut) {
// we have a response in out and the pattern is out capable
answer = result.getOut().getBody();
@@ -506,9 +506,8 @@
}
protected boolean hasFaultMessage(Exchange result) {
- Message faultMessage = result.getFault(false);
- if (faultMessage != null) {
- Object faultBody = faultMessage.getBody();
+ if (result.hasFault()) {
+ Object faultBody = result.getFault().getBody();
if (faultBody != null) {
return true;
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultScheduledPollConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultScheduledPollConsumer.java?rev=769448&r1=769447&r2=769448&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultScheduledPollConsumer.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultScheduledPollConsumer.java Tue Apr 28 16:15:35 2009
@@ -50,11 +50,10 @@
// if the result of the polled exchange has output we should create a new exchange and
// use the output as input to the next processor
- Message out = exchange.getOut(false);
- if (out != null) {
+ if (exchange.hasOut()) {
// lets create a new exchange
Exchange newExchange = getEndpoint().createExchange();
- newExchange.getIn().copyFrom(out);
+ newExchange.getIn().copyFrom(exchange.getOut());
exchange = newExchange;
}
getProcessor().process(exchange);
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/InterceptEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/InterceptEndpoint.java?rev=769448&r1=769447&r2=769448&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/InterceptEndpoint.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/InterceptEndpoint.java Tue Apr 28 16:15:35 2009
@@ -110,7 +110,7 @@
}
detour.process(exchange);
// copy OUT to IN
- if (exchange.getOut(false) != null) {
+ if (exchange.hasOut()) {
// replace OUT with IN as detour changed something
exchange.setIn(exchange.getOut());
exchange.setOut(null);
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/language/bean/BeanExpression.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/language/bean/BeanExpression.java?rev=769448&r1=769447&r2=769448&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/language/bean/BeanExpression.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/language/bean/BeanExpression.java Tue Apr 28 16:15:35 2009
@@ -76,7 +76,7 @@
newExchange.setPattern(ExchangePattern.InOut);
}
processor.process(newExchange);
- return newExchange.getOut(true).getBody();
+ return newExchange.getOut().getBody();
} catch (Exception e) {
throw new RuntimeBeanExpressionException(exchange, beanName, method, e);
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MarshalProcessor.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MarshalProcessor.java?rev=769448&r1=769447&r2=769448&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MarshalProcessor.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MarshalProcessor.java Tue Apr 28 16:15:35 2009
@@ -46,7 +46,7 @@
// lets setup the out message before we invoke the dataFormat
// so that it can mutate it if necessary
- Message out = exchange.getOut(true);
+ Message out = exchange.getOut();
out.copyFrom(in);
dataFormat.marshal(exchange, body, buffer);
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Pipeline.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Pipeline.java?rev=769448&r1=769447&r2=769448&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Pipeline.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Pipeline.java Tue Apr 28 16:15:35 2009
@@ -69,7 +69,7 @@
if (LOG.isDebugEnabled()) {
LOG.debug("Message exchange has failed so breaking out of pipeline: " + nextExchange
+ " exception: " + nextExchange.getException() + " fault: "
- + nextExchange.getFault(false)
+ + (nextExchange.hasFault() ? nextExchange.getFault() : null)
+ (exceptionHandled ? " handled by the error handler" : ""));
}
break;
@@ -131,7 +131,7 @@
if (LOG.isDebugEnabled()) {
LOG.debug("Message exchange has failed so breaking out of pipeline: " + nextExchange
+ " exception: " + nextExchange.getException() + " fault: "
- + nextExchange.getFault(false)
+ + (nextExchange.hasFault() ? nextExchange.getFault() : null)
+ (exceptionHandled ? " handled by the error handler" : ""));
}
break;
@@ -177,10 +177,9 @@
// now lets set the input of the next exchange to the output of the
// previous message if it is not null
- Message previousOut = previousExchange.getOut(false);
Message in = answer.getIn();
- if (previousOut != null) {
- in.copyFrom(previousOut);
+ if (previousExchange.hasOut()) {
+ in.copyFrom(previousExchange.getOut());
} else {
in.copyFrom(previousExchange.getIn());
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java?rev=769448&r1=769447&r2=769448&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java Tue Apr 28 16:15:35 2009
@@ -104,13 +104,12 @@
* message.
*/
private Message getResultMessage(Exchange exchange) {
- Message message = exchange.getOut(false);
- // if this endpoint had no out (like a mock endpoint)
- // just take the in
- if (message == null) {
- message = exchange.getIn();
+ if (exchange.hasOut()) {
+ return exchange.getOut();
+ } else {
+ // if this endpoint had no out (like a mock endpoint) just take the in
+ return exchange.getIn();
}
- return message;
}
/**
@@ -131,9 +130,8 @@
private void copyOutToIn(Exchange result, Exchange source) {
result.setException(source.getException());
- Message fault = source.getFault(false);
- if (fault != null) {
- result.getFault(true).copyFrom(fault);
+ if (source.hasFault()) {
+ result.getFault().copyFrom(source.getFault());
}
result.setIn(getResultMessage(source));
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/UnmarshalProcessor.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/UnmarshalProcessor.java?rev=769448&r1=769447&r2=769448&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/UnmarshalProcessor.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/UnmarshalProcessor.java Tue Apr 28 16:15:35 2009
@@ -45,7 +45,7 @@
try {
// lets setup the out message before we invoke the dataFormat
// so that it can mutate it if necessary
- Message out = exchange.getOut(true);
+ Message out = exchange.getOut();
out.copyFrom(exchange.getIn());
Object result = dataFormat.unmarshal(exchange, stream);
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DebugInterceptor.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DebugInterceptor.java?rev=769448&r1=769447&r2=769448&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DebugInterceptor.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DebugInterceptor.java Tue Apr 28 16:15:35 2009
@@ -143,9 +143,8 @@
answer.getIn().copyFrom(previousExchange.getIn());
// only copy the out if its defined
- Message previousOut = previousExchange.getOut(false);
- if (previousOut != null) {
- answer.getOut().copyFrom(previousOut);
+ if (previousExchange.hasOut()) {
+ answer.getOut().copyFrom(previousExchange.getOut());
}
return answer;
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultTraceEventMessage.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultTraceEventMessage.java?rev=769448&r1=769447&r2=769448&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultTraceEventMessage.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultTraceEventMessage.java Tue Apr 28 16:15:35 2009
@@ -56,9 +56,6 @@
public DefaultTraceEventMessage(final Date timestamp, final ProcessorDefinition toNode, final Exchange exchange) {
Message in = exchange.getIn();
- // false because we don't want to introduce side effects
- Message out = exchange.getOut(false);
-
// need to use defensive copies to avoid Exchange altering after the point of interception
this.timestamp = timestamp;
this.fromEndpointUri = exchange.getFromEndpoint() != null ? exchange.getFromEndpoint().getEndpointUri() : null;
@@ -71,7 +68,8 @@
this.headers = in.getHeaders().isEmpty() ? null : in.getHeaders().toString();
this.body = MessageHelper.extractBodyAsString(in);
this.bodyType = MessageHelper.getBodyTypeName(in);
- if (out != null) {
+ if (exchange.hasOut()) {
+ Message out = exchange.getOut();
this.outHeaders = out.getHeaders().isEmpty() ? null : out.getHeaders().toString();
this.outBody = MessageHelper.extractBodyAsString(out);
this.outBodyType = MessageHelper.getBodyTypeName(out);
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultTraceFormatter.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultTraceFormatter.java?rev=769448&r1=769447&r2=769448&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultTraceFormatter.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultTraceFormatter.java Tue Apr 28 16:15:35 2009
@@ -46,7 +46,10 @@
public Object format(final TraceInterceptor interceptor, final ProcessorDefinition node, final Exchange exchange) {
Message in = exchange.getIn();
- Message out = exchange.getOut(false);
+ Message out = null;
+ if (exchange.hasOut()) {
+ out = exchange.getOut();
+ }
StringBuilder sb = new StringBuilder();
sb.append(extractBreadCrumb(interceptor, node, exchange));
@@ -285,7 +288,7 @@
// assemble result with and without the to/from
if (showNode) {
result = id.trim() + " >>> " + from + " --> " + to.trim();
- if (interceptor.shouldTraceOutExchanges() && exchange.getOut(false) != null) {
+ if (interceptor.shouldTraceOutExchanges() && exchange.hasOut()) {
result += " (OUT) ";
}
} else {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/HandleFaultInterceptor.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/HandleFaultInterceptor.java?rev=769448&r1=769447&r2=769448&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/HandleFaultInterceptor.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/HandleFaultInterceptor.java Tue Apr 28 16:15:35 2009
@@ -78,9 +78,8 @@
*/
protected void handleFault(Exchange exchange) {
// Take the fault message out before we keep on going
- Message faultMessage = exchange.getFault(false);
- if (faultMessage != null) {
- final Object faultBody = faultMessage.getBody();
+ if (exchange.hasFault()) {
+ final Object faultBody = exchange.getFault().getBody();
if (faultBody != null && exchange.getException() == null) {
// remove fault as we are converting it to an exception
exchange.removeFault();
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java?rev=769448&r1=769447&r2=769448&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java Tue Apr 28 16:15:35 2009
@@ -178,14 +178,12 @@
if (result != source) {
result.setException(source.getException());
- Message fault = source.getFault(false);
- if (fault != null) {
- result.getFault(true).copyFrom(fault);
+ if (source.hasFault()) {
+ result.getFault().copyFrom(source.getFault());
}
- Message out = source.getOut(false);
- if (out != null) {
- result.getOut(true).copyFrom(out);
+ if (source.hasOut()) {
+ result.getOut().copyFrom(source.getOut());
} else if (result.getPattern() == ExchangePattern.InOptionalOut) {
// special case where the result is InOptionalOut and with no OUT response
// so we should return null to indicate this fact
@@ -197,7 +195,7 @@
// so lets assume the last IN is the OUT
if (result.getPattern().isOutCapable()) {
// only set OUT if its OUT capable
- result.getOut(true).copyFrom(source.getIn());
+ result.getOut().copyFrom(source.getIn());
} else {
// if not replace IN instead to keep the MEP
result.getIn().copyFrom(source.getIn());
@@ -227,20 +225,17 @@
}
// copy in message
- Message m = source.getIn();
- result.getIn().copyFrom(m);
+ result.getIn().copyFrom(source.getIn());
// copy out message
- m = source.getOut(false);
- if (m != null) {
+ if (source.hasOut()) {
// exchange pattern sensitive
- getResultMessage(result).copyFrom(m);
+ getResultMessage(result).copyFrom(source.getOut());
}
// copy fault message
- m = source.getFault(false);
- if (m != null) {
- result.getFault().copyFrom(m);
+ if (source.hasFault()) {
+ result.getFault().copyFrom(source.getFault());
}
// copy exception
@@ -325,7 +320,7 @@
map.put("headers", in.getHeaders());
map.put("body", in.getBody());
if (isOutCapable(exchange)) {
- Message out = exchange.getOut(true);
+ Message out = exchange.getOut();
map.put("out", out);
map.put("response", out);
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanPipelineTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanPipelineTest.java?rev=769448&r1=769447&r2=769448&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanPipelineTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanPipelineTest.java Tue Apr 28 16:15:35 2009
@@ -74,7 +74,7 @@
String body = exchange.getIn().getBody(String.class);
assertEquals("Hello World", body);
assertEquals("Claus", exchange.getIn().getHeader("from"));
- exchange.getOut(true).setHeader("from", "James");
+ exchange.getOut().setHeader("from", "James");
exchange.getOut().setBody("Hello World from James");
}
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/direct/DirectNoToTypeTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/direct/DirectNoToTypeTest.java?rev=769448&r1=769447&r2=769448&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/direct/DirectNoToTypeTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/direct/DirectNoToTypeTest.java Tue Apr 28 16:15:35 2009
@@ -37,7 +37,7 @@
from("direct:in").process(new Processor() {
public void process(Exchange exchange) throws Exception {
String body = exchange.getIn().getBody(String.class);
- exchange.getOut(true).setBody(body + " World");
+ exchange.getOut().setBody(body + " World");
}
});
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/FaultRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/FaultRouteTest.java?rev=769448&r1=769447&r2=769448&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/FaultRouteTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/FaultRouteTest.java Tue Apr 28 16:15:35 2009
@@ -62,7 +62,7 @@
});
assertMockEndpointsSatisfied();
- assertNull("Fault should be removed", response.getFault(false));
+ assertFalse("Fault should be removed", response.hasFault());
assertNotNull("Should have exception", response.getException());
assertEquals("fault", response.getException().getMessage());
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/PipelineTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/PipelineTest.java?rev=769448&r1=769447&r2=769448&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/PipelineTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/PipelineTest.java Tue Apr 28 16:15:35 2009
@@ -35,7 +35,7 @@
*/
private final class InToOut implements Processor {
public void process(Exchange exchange) throws Exception {
- exchange.getOut(true).copyFrom(exchange.getIn());
+ exchange.getOut().copyFrom(exchange.getIn());
Integer counter = exchange.getIn().getHeader("copy-counter", Integer.class);
if (counter == null) {
counter = 0;
@@ -49,7 +49,7 @@
*/
private final class InToFault implements Processor {
public void process(Exchange exchange) throws Exception {
- exchange.getFault(true).setBody(exchange.getIn().getBody());
+ exchange.getFault().setBody(exchange.getIn().getBody());
Integer counter = exchange.getIn().getHeader("copy-counter", Integer.class);
if (counter == null) {
counter = 0;
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterTest.java?rev=769448&r1=769447&r2=769448&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterTest.java Tue Apr 28 16:15:35 2009
@@ -84,7 +84,7 @@
}
});
- assertNull(result.getOut(false));
+ assertFalse("Should not have out", result.hasOut());
}
public void testSendingAMessageUsingMulticastReceivesItsOwnExchangeParallel() throws Exception {
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/UnitOfWorkTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/UnitOfWorkTest.java?rev=769448&r1=769447&r2=769448&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/UnitOfWorkTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/UnitOfWorkTest.java Tue Apr 28 16:15:35 2009
@@ -103,7 +103,7 @@
String name = getName();
if (name.equals("testFail")) {
log.info("Failing test!");
- exchange.getFault(true).setBody("testFail() should always fail with a fault!");
+ exchange.getFault().setBody("testFail() should always fail with a fault!");
} else if (name.equals("testException")) {
log.info("Throwing exception!");
throw new Exception("Failing test!");
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/enricher/EnricherTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/enricher/EnricherTest.java?rev=769448&r1=769447&r2=769448&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/enricher/EnricherTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/enricher/EnricherTest.java Tue Apr 28 16:15:35 2009
@@ -59,8 +59,8 @@
});
mock.assertIsSatisfied();
assertEquals("test", exchange.getIn().getBody());
- assertEquals("failed", exchange.getFault(false).getBody());
- assertNull(exchange.getOut(false));
+ assertEquals("failed", exchange.getFault().getBody());
+ assertFalse(exchange.hasOut());
assertNull(exchange.getException());
}
@@ -74,8 +74,8 @@
mock.assertIsSatisfied();
assertEquals("test", exchange.getIn().getBody());
assertEquals("failed", exchange.getException().getMessage());
- assertNull(exchange.getFault(false));
- assertNull(exchange.getOut(false));
+ assertFalse(exchange.hasFault());
+ assertFalse(exchange.hasOut());
}
// -------------------------------------------------------------
@@ -98,7 +98,7 @@
assertEquals("test", exchange.getIn().getBody());
assertEquals("bar", exchange.getOut().getHeader("foo"));
assertEquals("test:blah", exchange.getOut().getBody());
- assertNull(exchange.getFault(false));
+ assertFalse(exchange.hasFault());
assertNull(exchange.getException());
}
@@ -109,8 +109,8 @@
}
});
assertEquals("test", exchange.getIn().getBody());
- assertEquals("failed", exchange.getFault(false).getBody());
- assertNull(exchange.getOut(false));
+ assertEquals("failed", exchange.getFault().getBody());
+ assertFalse(exchange.hasOut());
assertNull(exchange.getException());
}
@@ -122,8 +122,8 @@
});
assertEquals("test", exchange.getIn().getBody());
assertEquals("failed", exchange.getException().getMessage());
- assertNull(exchange.getFault(false));
- assertNull(exchange.getOut(false));
+ assertFalse(exchange.hasFault());
+ assertFalse(exchange.hasOut());
}
protected RouteBuilder createRouteBuilder() {
Modified: camel/trunk/components/camel-freemarker/src/main/java/org/apache/camel/component/freemarker/FreemarkerEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-freemarker/src/main/java/org/apache/camel/component/freemarker/FreemarkerEndpoint.java?rev=769448&r1=769447&r2=769448&view=diff
==============================================================================
--- camel/trunk/components/camel-freemarker/src/main/java/org/apache/camel/component/freemarker/FreemarkerEndpoint.java (original)
+++ camel/trunk/components/camel-freemarker/src/main/java/org/apache/camel/component/freemarker/FreemarkerEndpoint.java Tue Apr 28 16:15:35 2009
@@ -106,7 +106,7 @@
buffer.flush();
// now lets output the results to the exchange
- Message out = exchange.getOut(true);
+ Message out = exchange.getOut();
out.setBody(buffer.toString());
out.setHeader(FreemarkerConstants.FREEMARKER_RESOURCE, getResource());
out.setHeader(FreemarkerConstants.FREEMARKER_RESOURCE_URI, path);
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=769448&r1=769447&r2=769448&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 Tue Apr 28 16:15:35 2009
@@ -55,9 +55,8 @@
public void writeResponse(HttpExchange exchange, HttpServletResponse response) throws IOException {
if (exchange.isFailed()) {
- Message fault = exchange.getFault(false);
- if (fault != null) {
- doWriteFaultResponse(fault, response, exchange);
+ if (exchange.hasFault()) {
+ doWriteFaultResponse(exchange.getFault(), response, exchange);
} else {
doWriteExceptionResponse(exchange.getException(), response);
}
Modified: camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java?rev=769448&r1=769447&r2=769448&view=diff
==============================================================================
--- camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java (original)
+++ camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java Tue Apr 28 16:15:35 2009
@@ -94,7 +94,7 @@
}
protected void populateResponse(Exchange exchange, HttpMethod method, Message in, HeaderFilterStrategy strategy, int responseCode) throws IOException {
- Message answer = exchange.getOut(true);
+ Message answer = exchange.getOut();
answer.setHeaders(in.getHeaders());
answer.setHeader(HttpConstants.HTTP_RESPONSE_CODE, responseCode);
@@ -151,10 +151,9 @@
* @throws IOException can be thrown
*/
protected static InputStream extractResponseBody(HttpMethod method, Exchange exchange) throws IOException {
- CachedOutputStream cos = null;
InputStream is = null;
try {
- cos = new CachedOutputStream(exchange.getContext().getProperties());
+ CachedOutputStream cos = new CachedOutputStream(exchange.getContext().getProperties());
is = GZIPHelper.getInputStream(method);
// in case of no response stream
if (is == null) {
Modified: camel/trunk/components/camel-ibatis/src/main/java/org/apache/camel/component/ibatis/IBatisProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ibatis/src/main/java/org/apache/camel/component/ibatis/IBatisProducer.java?rev=769448&r1=769447&r2=769448&view=diff
==============================================================================
--- camel/trunk/components/camel-ibatis/src/main/java/org/apache/camel/component/ibatis/IBatisProducer.java (original)
+++ camel/trunk/components/camel-ibatis/src/main/java/org/apache/camel/component/ibatis/IBatisProducer.java Tue Apr 28 16:15:35 2009
@@ -50,7 +50,7 @@
Object body = exchange.getIn().getBody();
if (ObjectHelper.isEmpty(body)) {
// must be a poll so lets do a query
- Message msg = exchange.getOut(true);
+ Message msg = exchange.getOut();
if (LOG.isTraceEnabled()) {
LOG.trace("Querying for list: " + statement);
}
Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ExplicitHttpsRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ExplicitHttpsRouteTest.java?rev=769448&r1=769447&r2=769448&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ExplicitHttpsRouteTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ExplicitHttpsRouteTest.java Tue Apr 28 16:15:35 2009
@@ -43,7 +43,7 @@
Processor proc = new Processor() {
public void process(Exchange exchange) throws Exception {
- exchange.getOut(true).setBody("<b>Hello World</b>");
+ exchange.getOut().setBody("<b>Hello World</b>");
}
};
from("jetty:https://localhost:9080/hello").process(proc);
Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpClientRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpClientRouteTest.java?rev=769448&r1=769447&r2=769448&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpClientRouteTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpClientRouteTest.java Tue Apr 28 16:15:35 2009
@@ -70,7 +70,7 @@
Processor proc = new Processor() {
public void process(Exchange exchange) throws Exception {
ByteArrayInputStream bis = new ByteArrayInputStream("<b>Hello World</b>".getBytes());
- exchange.getOut(true).setBody(bis);
+ exchange.getOut().setBody(bis);
}
};
from("jetty:http://localhost:9080/hello").process(proc);
Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpRouteTest.java?rev=769448&r1=769447&r2=769448&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpRouteTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpRouteTest.java Tue Apr 28 16:15:35 2009
@@ -93,7 +93,7 @@
} catch (Exception e) {
exchange.getFault().setBody(e);
}
- exchange.getOut(true).setBody("<b>Hello World</b>");
+ exchange.getOut().setBody("<b>Hello World</b>");
}
};
from("jetty:http://localhost:9080/hello?sessionSupport=true").process(proc);
Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteSetupWithSystemPropsTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteSetupWithSystemPropsTest.java?rev=769448&r1=769447&r2=769448&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteSetupWithSystemPropsTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteSetupWithSystemPropsTest.java Tue Apr 28 16:15:35 2009
@@ -47,7 +47,7 @@
Processor proc = new Processor() {
public void process(Exchange exchange) throws Exception {
- exchange.getOut(true).setBody("<b>Hello World</b>");
+ exchange.getOut().setBody("<b>Hello World</b>");
}
};
from("jetty:https://localhost:9080/hello").process(proc);
Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteTest.java?rev=769448&r1=769447&r2=769448&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteTest.java Tue Apr 28 16:15:35 2009
@@ -146,7 +146,7 @@
Processor proc = new Processor() {
public void process(Exchange exchange) throws Exception {
- exchange.getOut(true).setBody("<b>Hello World</b>");
+ exchange.getOut().setBody("<b>Hello World</b>");
}
};
from("jetty:https://localhost:9080/hello").process(proc);
Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpGetWithParamTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpGetWithParamTest.java?rev=769448&r1=769447&r2=769448&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpGetWithParamTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpGetWithParamTest.java Tue Apr 28 16:15:35 2009
@@ -70,9 +70,9 @@
Assert.assertEquals("uno", http.getRequest().getParameter("one"));
Assert.assertEquals("dos", http.getRequest().getParameter("two"));
- exchange.getOut(true).setBody("Bye World");
- exchange.getOut(true).setHeader("one", "einz");
- exchange.getOut(true).setHeader("two", "twei");
+ exchange.getOut().setBody("Bye World");
+ exchange.getOut().setHeader("one", "einz");
+ exchange.getOut().setHeader("two", "twei");
}
}
Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyRouteTest.java?rev=769448&r1=769447&r2=769448&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyRouteTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyRouteTest.java Tue Apr 28 16:15:35 2009
@@ -60,7 +60,7 @@
assertEquals("bookid=123", body);
// send a html response
- exchange.getOut(true).setBody("<html><body>Book 123 is Camel in Action</body></html>");
+ exchange.getOut().setBody("<html><body>Book 123 is Camel in Action</body></html>");
}
}
// END SNIPPET: e2
Modified: camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/EndpointMessageListener.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/EndpointMessageListener.java?rev=769448&r1=769447&r2=769448&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/EndpointMessageListener.java (original)
+++ camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/EndpointMessageListener.java Tue Apr 28 16:15:35 2009
@@ -97,9 +97,9 @@
body = exchange.getFault();
sendReply = true;
}
- } else if (exchange.getOut(false) != null) {
+ } else if (exchange.hasOut()) {
// process OK so get the reply
- body = exchange.getOut(false);
+ body = exchange.getOut();
sendReply = true;
}
Modified: camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java?rev=769448&r1=769447&r2=769448&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java (original)
+++ camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java Tue Apr 28 16:15:35 2009
@@ -262,7 +262,7 @@
// correlation
if (correlationId != null) {
message.setJMSCorrelationID(correlationId);
- exchange.getOut(false).setHeader("JMSCorrelationID", correlationId);
+ exchange.getOut().setHeader("JMSCorrelationID", correlationId);
}
} else {
// no response, so lets set a timed out exception
@@ -311,8 +311,8 @@
}
try {
JmsExchange jmsExchange = JmsExchange.class.cast(exchange);
- JmsMessage out = jmsExchange.getOut(false);
- if (out != null) {
+ if (jmsExchange.hasOut()) {
+ JmsMessage out = jmsExchange.getOut();
out.setMessageId(out.getJmsMessage().getJMSMessageID());
}
} catch (JMSException e) {
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteRequestReplyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteRequestReplyTest.java?rev=769448&r1=769447&r2=769448&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteRequestReplyTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteRequestReplyTest.java Tue Apr 28 16:15:35 2009
@@ -38,6 +38,9 @@
* @version $Revision$
*/
public class JmsRouteRequestReplyTest extends ContextTestSupport {
+
+ // TODO: Split into multiple files so it doesnt take 3 min to run
+
protected static final String REPLY_TO_DESTINATION_SELECTOR_NAME = "camelProducer";
protected static String componentName = "amq";
protected static String componentName1 = "amq1";
@@ -76,7 +79,7 @@
from(endpoingUriA).process(new Processor() {
public void process(Exchange e) {
String request = e.getIn().getBody(String.class);
- e.getOut(true).setBody(expectedReply + request.substring(request.indexOf('-')));
+ e.getOut().setBody(expectedReply + request.substring(request.indexOf('-')));
}
});
}
@@ -88,7 +91,7 @@
from(endpointUriB).process(new Processor() {
public void process(Exchange e) {
String request = e.getIn().getBody(String.class);
- e.getOut(true).setBody(expectedReply + request.substring(request.indexOf('-')));
+ e.getOut().setBody(expectedReply + request.substring(request.indexOf('-')));
}
});
}
@@ -100,7 +103,7 @@
from(endpointUriB).process(new Processor() {
public void process(Exchange e) {
Message in = e.getIn();
- Message out = e.getOut(true);
+ Message out = e.getOut();
String selectorValue = in.getHeader(REPLY_TO_DESTINATION_SELECTOR_NAME, String.class);
String request = in.getBody(String.class);
out.setHeader(REPLY_TO_DESTINATION_SELECTOR_NAME, selectorValue);
@@ -116,7 +119,7 @@
from(endpointUriB1).process(new Processor() {
public void process(Exchange e) {
String request = e.getIn().getBody(String.class);
- e.getOut(true).setBody(expectedReply + request.substring(request.indexOf('-')));
+ e.getOut().setBody(expectedReply + request.substring(request.indexOf('-')));
}
});
}
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSimpleRequestCustomReplyToTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSimpleRequestCustomReplyToTest.java?rev=769448&r1=769447&r2=769448&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSimpleRequestCustomReplyToTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSimpleRequestCustomReplyToTest.java Tue Apr 28 16:15:35 2009
@@ -60,7 +60,7 @@
result.assertIsSatisfied();
assertNotNull(out);
- assertNull(out.getOut(false));
+ assertFalse(out.hasOut());
// get the reply from the special reply queue
Endpoint end = context.getEndpoint(componentName + ":" + myReplyTo);
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/QueueToQueueRequestReplyTransactionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/QueueToQueueRequestReplyTransactionTest.java?rev=769448&r1=769447&r2=769448&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/QueueToQueueRequestReplyTransactionTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/QueueToQueueRequestReplyTransactionTest.java Tue Apr 28 16:15:35 2009
@@ -54,7 +54,7 @@
from("activemq-1:queue:bar").process(new Processor() {
public void process(Exchange e) {
String request = e.getIn().getBody(String.class);
- Message out = e.getOut(true);
+ Message out = e.getOut();
String selectorValue = e.getIn().getHeader("camelProvider", String.class);
if (selectorValue != null) {
out.setHeader("camelProvider", selectorValue);
@@ -104,7 +104,7 @@
from("activemq-1:queue:bar").process(new Processor() {
public void process(Exchange e) {
String request = e.getIn().getBody(String.class);
- Message out = e.getOut(true);
+ Message out = e.getOut();
String selectorValue = e.getIn().getHeader("camelProvider", String.class);
out.setHeader("camelProvider", selectorValue);
out.setBody("Re: " + request);
Modified: camel/trunk/components/camel-juel/src/main/java/org/apache/camel/language/juel/JuelExpression.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-juel/src/main/java/org/apache/camel/language/juel/JuelExpression.java?rev=769448&r1=769447&r2=769448&view=diff
==============================================================================
--- camel/trunk/components/camel-juel/src/main/java/org/apache/camel/language/juel/JuelExpression.java (original)
+++ camel/trunk/components/camel-juel/src/main/java/org/apache/camel/language/juel/JuelExpression.java Tue Apr 28 16:15:35 2009
@@ -89,8 +89,9 @@
protected ELContext populateContext(ELContext context, Exchange exchange) {
setVariable(context, "exchange", exchange, Exchange.class);
setVariable(context, "in", exchange.getIn(), Message.class);
- Message out = exchange.getOut(false);
- setVariable(context, "out", out, Message.class);
+ if (exchange.hasOut()) {
+ setVariable(context, "out", exchange.getOut(), Message.class);
+ }
return context;
}
Modified: camel/trunk/components/camel-mvel/src/test/java/org/apache/camel/language/mvel/MvelTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mvel/src/test/java/org/apache/camel/language/mvel/MvelTest.java?rev=769448&r1=769447&r2=769448&view=diff
==============================================================================
--- camel/trunk/components/camel-mvel/src/test/java/org/apache/camel/language/mvel/MvelTest.java (original)
+++ camel/trunk/components/camel-mvel/src/test/java/org/apache/camel/language/mvel/MvelTest.java Tue Apr 28 16:15:35 2009
@@ -30,13 +30,13 @@
}
public void testGetOutFalseKeepsNullOutMessage() throws Exception {
- assertExpression("exchange.getOut(false)", null);
- assertNull(exchange.getOut(false));
+ assertExpression("exchange.hasOut()", false);
+ assertFalse(exchange.hasOut());
}
public void testResponseCreatesOutMessage() throws Exception {
assertExpression("response.body", null);
- assertNotNull(exchange.getOut(false));
+ assertTrue(exchange.hasOut());
}
protected String getLanguageName() {
Modified: camel/trunk/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/OgnlTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/OgnlTest.java?rev=769448&r1=769447&r2=769448&view=diff
==============================================================================
--- camel/trunk/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/OgnlTest.java (original)
+++ camel/trunk/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/OgnlTest.java Tue Apr 28 16:15:35 2009
@@ -33,13 +33,13 @@
}
public void testGetOutFalseKeepsNullOutMessage() throws Exception {
- assertExpression("exchange.getOut(false)", null);
- assertNull(exchange.getOut(false));
+ assertExpression("exchange.hasOut()", false);
+ assertFalse(exchange.hasOut());
}
public void testResponseCreatesOutMessage() throws Exception {
assertExpression("response.body", null);
- assertNotNull(exchange.getOut(false));
+ assertTrue(exchange.hasOut());
}
protected String getLanguageName() {
Modified: camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java?rev=769448&r1=769447&r2=769448&view=diff
==============================================================================
--- camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java (original)
+++ camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java Tue Apr 28 16:15:35 2009
@@ -168,17 +168,17 @@
if (exchange.isFailed()) {
// 500 for internal server error which can be overridden by response code in header
response.setStatus(Status.valueOf(500));
- out = exchange.getFault(false);
- if (out == null) {
- Throwable t = exchange.getException();
- if (t != null) {
- StringWriter sw = new StringWriter();
- PrintWriter pw = new PrintWriter(sw);
- t.printStackTrace(pw);
- response.setEntity(sw.toString(), MediaType.TEXT_PLAIN);
- return;
- }
- }
+ if (exchange.hasFault()) {
+ out = exchange.getFault();
+ } else {
+ // print exception as message and stacktrace
+ Exception t = exchange.getException();
+ StringWriter sw = new StringWriter();
+ PrintWriter pw = new PrintWriter(sw);
+ t.printStackTrace(pw);
+ response.setEntity(sw.toString(), MediaType.TEXT_PLAIN);
+ return;
+ }
} else {
out = exchange.getOut();
}
Modified: camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java?rev=769448&r1=769447&r2=769448&view=diff
==============================================================================
--- camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java (original)
+++ camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java Tue Apr 28 16:15:35 2009
@@ -89,7 +89,7 @@
public void process(Exchange exchange) throws Exception {
Object body = evaluate(exchange);
- exchange.getOut(true).setBody(body);
+ exchange.getOut().setBody(body);
// propogate headers
exchange.getOut().getHeaders().putAll(exchange.getIn().getHeaders());
@@ -426,9 +426,8 @@
addParameters(dynamicQueryContext, getParameters());
dynamicQueryContext.setParameter("exchange", exchange);
- Message out = exchange.getOut(false);
- if (out != null && exchange.getPattern().isOutCapable()) {
- dynamicQueryContext.setParameter("out.body", out.getBody());
+ if (exchange.hasOut() && exchange.getPattern().isOutCapable()) {
+ dynamicQueryContext.setParameter("out.body", exchange.getOut().getBody());
addParameters(dynamicQueryContext, exchange.getOut().getHeaders(), "out.headers.");
}
}
Modified: camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java?rev=769448&r1=769447&r2=769448&view=diff
==============================================================================
--- camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java (original)
+++ camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java Tue Apr 28 16:15:35 2009
@@ -536,7 +536,9 @@
context.setAttribute("context", exchange.getContext(), scope);
context.setAttribute("exchange", exchange, scope);
context.setAttribute("request", exchange.getIn(), scope);
- context.setAttribute("response", exchange.getOut(false), scope);
+ if (exchange.hasOut()) {
+ context.setAttribute("response", exchange.getOut(), scope);
+ }
}
protected InputStreamReader createScriptReader() throws IOException {
Modified: camel/trunk/components/camel-stringtemplate/src/main/java/org/apache/camel/component/stringtemplate/StringTemplateEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-stringtemplate/src/main/java/org/apache/camel/component/stringtemplate/StringTemplateEndpoint.java?rev=769448&r1=769447&r2=769448&view=diff
==============================================================================
--- camel/trunk/components/camel-stringtemplate/src/main/java/org/apache/camel/component/stringtemplate/StringTemplateEndpoint.java (original)
+++ camel/trunk/components/camel-stringtemplate/src/main/java/org/apache/camel/component/stringtemplate/StringTemplateEndpoint.java Tue Apr 28 16:15:35 2009
@@ -67,7 +67,7 @@
template.write(new AutoIndentWriter(buffer));
// now lets output the results to the exchange
- Message out = exchange.getOut(true);
+ Message out = exchange.getOut();
out.setBody(buffer.toString());
out.setHeader(StringTemplateConstants.STRINGTEMPLATE_RESOURCE, getResource());
}
Modified: camel/trunk/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityEndpoint.java?rev=769448&r1=769447&r2=769448&view=diff
==============================================================================
--- camel/trunk/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityEndpoint.java (original)
+++ camel/trunk/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityEndpoint.java Tue Apr 28 16:15:35 2009
@@ -124,7 +124,7 @@
engine.evaluate(velocityContext, buffer, logTag, reader);
// now lets output the results to the exchange
- Message out = exchange.getOut(true);
+ Message out = exchange.getOut();
out.setBody(buffer.toString());
out.setHeader(VelocityConstants.VELOCITY_RESOURCE, resource);
out.setHeader(VelocityConstants.VELOCITY_RESOURCE_URI, path);
Modified: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/ExchangeResource.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/ExchangeResource.java?rev=769448&r1=769447&r2=769448&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/ExchangeResource.java (original)
+++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/ExchangeResource.java Tue Apr 28 16:15:35 2009
@@ -63,6 +63,10 @@
return exchange.getFault();
}
+ public boolean hasFault() {
+ return exchange.hasFault();
+ }
+
public Endpoint getFromEndpoint() {
return exchange.getFromEndpoint();
}
@@ -72,7 +76,11 @@
}
public Message getOut() {
- return exchange.getOut(false);
+ return exchange.getOut();
+ }
+
+ public boolean hasOut() {
+ return exchange.hasOut();
}
public Map<String, Object> getProperties() {
Modified: camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/queue/version/BankResponseAggregationStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/queue/version/BankResponseAggregationStrategy.java?rev=769448&r1=769447&r2=769448&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/queue/version/BankResponseAggregationStrategy.java (original)
+++ camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/queue/version/BankResponseAggregationStrategy.java Tue Apr 28 16:15:35 2009
@@ -35,28 +35,28 @@
// Here we put the bank response together
public Exchange aggregate(Exchange oldExchange, Exchange newExchange) {
LOG.debug("Get the exchange to aggregate, older: " + oldExchange + " newer:" + newExchange);
- Message oldMessage = null;
- Message newMessage = null;
+
+ Message oldMessage;
+ Message newMessage;
if (aggregatingOutMessage) {
- oldMessage = oldExchange.getOut(false);
- newMessage = newExchange.getOut(false);
+ oldMessage = oldExchange.getOut();
+ newMessage = newExchange.getOut();
} else {
oldMessage = oldExchange.getIn();
newMessage = newExchange.getIn();
}
Double oldRate = oldMessage.getHeader(Constants.PROPERTY_RATE, Double.class);
Double newRate = newMessage.getHeader(Constants.PROPERTY_RATE, Double.class);
- Exchange result = null;
+ Exchange result;
if (newRate >= oldRate) {
result = oldExchange;
} else {
result = newExchange;
}
- LOG.debug("Get the lower rate exchange " + result);
+ LOG.debug("Get the lower rate exchange " + result);
return result;
-
}
}