svn commit: r1296457 - in /camel/trunk/camel-core/src/main/java/org/apache/camel/impl: DefaultMessage.java MessageSupport.java

[bvahdat]

Author: bvahdat
Date: Fri Mar  2 21:00:22 2012
New Revision: 1296457

URL: http://svn.apache.org/viewvc?rev=1296457&view=rev
Log:
Implement Message.copyFrom() solely at one class level.

Modified:
    
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultMessage.java
    
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/MessageSupport.java

Modified: 
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultMessage.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultMessage.java?rev=1296457&r1=1296456&r2=1296457&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultMessage.java 
(original)
+++ 
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultMessage.java 
Fri Mar  2 21:00:22 2012
@@ -22,7 +22,6 @@ import java.util.Set;
 import javax.activation.DataHandler;
 
 import org.apache.camel.Exchange;
-import org.apache.camel.Message;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.util.EndpointHelper;
 import org.apache.camel.util.MessageHelper;
@@ -47,12 +46,6 @@ public class DefaultMessage extends Mess
         return MessageHelper.extractBodyForLogging(this);
     }
 
-    @Override
-    public void copyFrom(Message that) {
-        super.copyFrom(that);
-        fault = that.isFault();
-    }
-
     public boolean isFault() {
         return fault;
     }

Modified: 
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/MessageSupport.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/MessageSupport.java?rev=1296457&r1=1296456&r2=1296457&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/MessageSupport.java 
(original)
+++ 
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/MessageSupport.java 
Fri Mar  2 21:00:22 2012
@@ -134,6 +134,8 @@ public abstract class MessageSupport imp
 
         setMessageId(that.getMessageId());
         setBody(that.getBody());
+        setFault(that.isFault());
+
         if (hasHeaders()) {
             getHeaders().clear();
         }