svn commit: r787911 - in /camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa: JpaEndpoint.java JpaProducer.java

[davsclaus]

Author: davsclaus
Date: Wed Jun 24 05:37:21 2009
New Revision: 787911

URL: http://svn.apache.org/viewvc?rev=787911&view=rev
Log:
CAMEL-1735: Fixed camel-example-etl using type converter not having default no 
arg ctr. Introduced JpaTemplate as a header from camel-jpa in case you need it.

Modified:
    
camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaEndpoint.java
    
camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaProducer.java

Modified: 
camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaEndpoint.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaEndpoint.java?rev=787911&r1=787910&r2=787911&view=diff
==============================================================================
--- 
camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaEndpoint.java
 (original)
+++ 
camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaEndpoint.java
 Wed Jun 24 05:37:21 2009
@@ -259,7 +259,6 @@
         } else {
             return new ExpressionAdapter() {
                 public Object evaluate(Exchange exchange) {
-                    exchange.getIn().setHeader(JpaConstants.JPA_TEMPLATE, 
getTemplate());
                     Object answer = exchange.getIn().getBody(type);
                     if (answer == null) {
                         Object defaultValue = exchange.getIn().getBody();

Modified: 
camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaProducer.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaProducer.java?rev=787911&r1=787910&r2=787911&view=diff
==============================================================================
--- 
camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaProducer.java
 (original)
+++ 
camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaProducer.java
 Wed Jun 24 05:37:21 2009
@@ -43,6 +43,7 @@
     }
 
     public void process(Exchange exchange) {
+        exchange.getIn().setHeader(JpaConstants.JPA_TEMPLATE, 
endpoint.getTemplate());
         final Object values = expression.evaluate(exchange, Object.class);
         if (values != null) {
             template.execute(new JpaCallback() {
@@ -59,5 +60,6 @@
                 }
             });
         }
+        exchange.getIn().removeHeader(JpaConstants.JPA_TEMPLATE);
     }
 }