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/06/26 21:04:40 UTC
svn commit: r788818 - in
/camel/trunk/camel-core/src/main/java/org/apache/camel:
component/file/GenericFileMessage.java impl/DefaultExchange.java
Author: hadrian
Date: Fri Jun 26 19:04:39 2009
New Revision: 788818
URL: http://svn.apache.org/viewvc?rev=788818&view=rev
Log:
CAMEL-1078. Assume out/fault message of the same type as in message and stop using createOut/FaultMessage() apis.
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileMessage.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileMessage.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileMessage.java?rev=788818&r1=788817&r2=788818&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileMessage.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileMessage.java Fri Jun 26 19:04:39 2009
@@ -39,7 +39,7 @@
@Override
protected Object createBody() {
- return file.getBody();
+ return file != null ? file.getBody() : super.createBody();
}
public GenericFile<T> getGenericFile() {
@@ -51,8 +51,8 @@
}
@Override
- public GenericFileMessage newInstance() {
- return new GenericFileMessage();
+ public GenericFileMessage<T> newInstance() {
+ return new GenericFileMessage<T>();
}
@Override
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=788818&r1=788817&r2=788818&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 Jun 26 19:04:39 2009
@@ -197,11 +197,7 @@
}
public Message getOut() {
- if (out == null) {
- out = createOutMessage();
- configureMessage(out);
- }
- return out;
+ return getOut(true);
}
public boolean hasOut() {
@@ -210,7 +206,8 @@
public Message getOut(boolean lazyCreate) {
if (out == null && lazyCreate) {
- out = createOutMessage();
+ out = (in != null && in instanceof MessageSupport)
+ ? ((MessageSupport)in).newInstance() : createOutMessage();
configureMessage(out);
}
return out;
@@ -261,21 +258,18 @@
this.fromEndpoint = fromEndpoint;
}
- public Message getFault() {
- if (fault == null) {
- fault = createFaultMessage();
- configureMessage(fault);
- }
- return fault;
- }
-
public boolean hasFault() {
return fault != null;
}
+ public Message getFault() {
+ return getFault(true);
+ }
+
public Message getFault(boolean lazyCreate) {
if (fault == null && lazyCreate) {
- fault = createFaultMessage();
+ fault = (in != null && in instanceof MessageSupport)
+ ? ((MessageSupport)in).newInstance() : createFaultMessage();
configureMessage(fault);
}
return fault;