Author: davsclaus
Date: Wed Oct 3 05:17:30 2012
New Revision: 1393295
URL: http://svn.apache.org/viewvc?rev=1393295&view=rev
Log:
CAMEL-5675: Favor using type converter for setProperties with
IntrospectionSupport
Modified:
camel/branches/camel-2.10.x/ (props changed)
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/component/log/LogComponent.java
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultTraceEventHandler.java
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1393294
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/component/log/LogComponent.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/component/log/LogComponent.java?rev=1393295&r1=1393294&r2=1393295&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/component/log/LogComponent.java
(original)
+++
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/component/log/LogComponent.java
Wed Oct 3 05:17:30 2012
@@ -52,7 +52,7 @@ public class LogComponent extends Defaul
logger = new ThroughputLogger(camelLogger, this.getCamelContext(),
groupInterval, groupDelay, groupActiveOnly);
} else {
LogFormatter formatter = new LogFormatter();
- IntrospectionSupport.setProperties(formatter, parameters);
+ setProperties(formatter, parameters);
logger = new CamelLogProcessor(camelLogger, formatter);
}
Modified:
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultTraceEventHandler.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultTraceEventHandler.java?rev=1393295&r1=1393294&r2=1393295&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultTraceEventHandler.java
(original)
+++
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultTraceEventHandler.java
Wed Oct 3 05:17:30 2012
@@ -99,9 +99,9 @@ public class DefaultTraceEventHandler im
// copy options from event to jpa
Map<String, Object> options = new HashMap<String, Object>();
IntrospectionSupport.getProperties(msg, options, null);
- IntrospectionSupport.setProperties(jpa, options);
+
IntrospectionSupport.setProperties(exchange.getContext().getTypeConverter(),
jpa, options);
// and set the timestamp as its not a String type
- IntrospectionSupport.setProperty(jpa, "timestamp",
msg.getTimestamp());
+
IntrospectionSupport.setProperty(exchange.getContext().getTypeConverter(), jpa,
"timestamp", msg.getTimestamp());
event.getIn().setBody(jpa);
} else {