svn commit: r801349 - /camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java

[davsclaus]

Author: davsclaus
Date: Wed Aug  5 18:24:00 2009
New Revision: 801349

URL: http://svn.apache.org/viewvc?rev=801349&view=rev
Log:
Puzzled had to revert the optimization

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

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=801349&r1=801348&r2=801349&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 
Wed Aug  5 18:24:00 2009
@@ -84,9 +84,7 @@
     public Exchange copy() {
         DefaultExchange exchange = new DefaultExchange(this);
 
-        if (exchange.hasProperties()) {
-            exchange.setProperties(getProperties());
-        }
+        exchange.setProperties(safeCopy(getProperties()));
         safeCopy(exchange.getIn(), getIn());
         if (hasOut()) {
             safeCopy(exchange.getOut(), getOut());
@@ -101,6 +99,13 @@
         }
     }
 
+    private static Map<String, Object> safeCopy(Map<String, Object> 
properties) {
+        if (properties == null) {
+            return null;
+        }
+        return new ConcurrentHashMap<String, Object>(properties);
+    }
+
     public CamelContext getContext() {
         return context;
     }