You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ha...@apache.org on 2009/07/31 23:40:20 UTC
svn commit: r799753 - in
/camel/trunk/camel-core/src/main/java/org/apache/camel: Exchange.java
impl/DefaultExchange.java processor/RoutingSlip.java util/ExchangeHelper.java
Author: hadrian
Date: Fri Jul 31 21:40:19 2009
New Revision: 799753
URL: http://svn.apache.org/viewvc?rev=799753&view=rev
Log:
Remove deprecated version of Exchange.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/impl/DefaultExchange.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java
camel/trunk/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.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=799753&r1=799752&r2=799753&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 Fri Jul 31 21:40:19 2009
@@ -201,16 +201,6 @@
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);
-
- /**
* Sets the outbound message
*
* @param out the outbound message
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=799753&r1=799752&r2=799753&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 Fri Jul 31 21:40:19 2009
@@ -200,15 +200,8 @@
}
public Message getOut() {
- return getOut(true);
- }
-
- public boolean hasOut() {
- return out != null;
- }
-
- public Message getOut(boolean lazyCreate) {
- if (out == null && lazyCreate) {
+ // lazy create
+ if (out == null) {
out = (in != null && in instanceof MessageSupport)
? ((MessageSupport)in).newInstance() : new DefaultMessage();
configureMessage(out);
@@ -216,6 +209,10 @@
return out;
}
+ public boolean hasOut() {
+ return out != null;
+ }
+
public void setOut(Message out) {
this.out = out;
configureMessage(out);
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=799753&r1=799752&r2=799753&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 Fri Jul 31 21:40:19 2009
@@ -152,7 +152,7 @@
result.setException(source.getException());
if (source.hasOut() && source.getOut().isFault()) {
- result.getOut(true).copyFrom(source.getOut());
+ result.getOut().copyFrom(source.getOut());
}
result.setIn(getResultMessage(source));
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=799753&r1=799752&r2=799753&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 Fri Jul 31 21:40:19 2009
@@ -239,7 +239,7 @@
// copy out message
if (source.hasOut()) {
// exchange pattern sensitive
- Message resultMessage = source.getOut().isFault() ? result.getOut(true) : getResultMessage(result);
+ Message resultMessage = source.getOut().isFault() ? result.getOut() : getResultMessage(result);
resultMessage.copyFrom(source.getOut());
}