Repository: camel Updated Branches: refs/heads/camel-2.14.x 550f5df6c -> b7723c089
CAMEL-8003: Fix the broken camel-examples-etl. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b7723c08 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b7723c08 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b7723c08 Branch: refs/heads/camel-2.14.x Commit: b7723c0892619d0e8c734c572aa5139cb2c4c5b0 Parents: 550f5df Author: Babak Vahdat <bvah...@apache.org> Authored: Thu Nov 6 20:13:54 2014 +0100 Committer: Babak Vahdat <bvah...@apache.org> Committed: Thu Nov 6 20:15:35 2014 +0100 ---------------------------------------------------------------------- .../java/org/apache/camel/component/jpa/JpaEndpoint.java | 8 ++------ .../java/org/apache/camel/component/jpa/JpaProducer.java | 4 ++-- .../org/apache/camel/example/etl/CustomerTransformer.java | 2 +- .../main/java/org/apache/camel/example/etl/EtlRoutes.java | 2 +- 4 files changed, 6 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/b7723c08/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaEndpoint.java b/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaEndpoint.java index 44fed92..2a8eb8f 100644 --- a/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaEndpoint.java +++ b/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaEndpoint.java @@ -312,12 +312,8 @@ public class JpaEndpoint extends ScheduledPollEndpoint { } catch (InvalidPayloadException e) { throw new InvalidPayloadRuntimeException(exchange, getEntityType(), e.getCause()); } - - if (answer == null) { - throw new InvalidPayloadRuntimeException(exchange, getEntityType()); - } else { - return answer; - } + // is never null + return answer; } }; } http://git-wip-us.apache.org/repos/asf/camel/blob/b7723c08/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaProducer.java b/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaProducer.java index 1565d4a..2fee422 100644 --- a/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaProducer.java +++ b/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaProducer.java @@ -53,11 +53,11 @@ public class JpaProducer extends DefaultProducer { } public void process(final Exchange exchange) { + // resolve the entity manager before evaluating the expression + final EntityManager entityManager = getTargetEntityManager(exchange, entityManagerFactory, getEndpoint().isUsePassedInEntityManager()); final Object values = expression.evaluate(exchange, Object.class); if (values != null) { - final EntityManager entityManager = getTargetEntityManager(exchange, entityManagerFactory, getEndpoint().isUsePassedInEntityManager()); - transactionTemplate.execute(new TransactionCallback<Object>() { public Object doInTransaction(TransactionStatus status) { if (getEndpoint().isJoinTransaction()) { http://git-wip-us.apache.org/repos/asf/camel/blob/b7723c08/examples/camel-example-etl/src/main/java/org/apache/camel/example/etl/CustomerTransformer.java ---------------------------------------------------------------------- diff --git a/examples/camel-example-etl/src/main/java/org/apache/camel/example/etl/CustomerTransformer.java b/examples/camel-example-etl/src/main/java/org/apache/camel/example/etl/CustomerTransformer.java index 5f2daff..505c783 100644 --- a/examples/camel-example-etl/src/main/java/org/apache/camel/example/etl/CustomerTransformer.java +++ b/examples/camel-example-etl/src/main/java/org/apache/camel/example/etl/CustomerTransformer.java @@ -51,7 +51,7 @@ public final class CustomerTransformer { */ @Converter public static CustomerEntity toCustomer(PersonDocument doc, Exchange exchange) throws Exception { - EntityManager entityManager = exchange.getIn().getHeader(JpaConstants.ENTITYMANAGER, EntityManager.class); + EntityManager entityManager = exchange.getProperty(JpaConstants.ENTITY_MANAGER, EntityManager.class); TransactionTemplate transactionTemplate = exchange.getContext().getRegistry().lookupByNameAndType("transactionTemplate", TransactionTemplate.class); String user = doc.getUser(); http://git-wip-us.apache.org/repos/asf/camel/blob/b7723c08/examples/camel-example-etl/src/main/java/org/apache/camel/example/etl/EtlRoutes.java ---------------------------------------------------------------------- diff --git a/examples/camel-example-etl/src/main/java/org/apache/camel/example/etl/EtlRoutes.java b/examples/camel-example-etl/src/main/java/org/apache/camel/example/etl/EtlRoutes.java index 2d2be2e..b65953a 100644 --- a/examples/camel-example-etl/src/main/java/org/apache/camel/example/etl/EtlRoutes.java +++ b/examples/camel-example-etl/src/main/java/org/apache/camel/example/etl/EtlRoutes.java @@ -33,7 +33,7 @@ public class EtlRoutes extends SpringRouteBuilder { .to("jpa:org.apache.camel.example.etl.CustomerEntity"); // the following will dump the database to files - from("jpa:org.apache.camel.example.etl.CustomerEntity?consumeDelete=false&delay=3000&consumeLockEntity=false") + from("jpa:org.apache.camel.example.etl.CustomerEntity?consumer.initialDelay=3000&delay=3000&consumeDelete=false&consumeLockEntity=false") .setHeader(Exchange.FILE_NAME, el("${in.body.userName}.xml")) .to("file:target/customers"); }
