[camel] branch master updated: extact receiveBody methods (#3486)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
     new 350a7b5  extact receiveBody methods (#3486)
350a7b5 is described below

commit 350a7b5fb4e0ec9775d73e3d886905f350759ec2
Author: DoiMasayuki <strsoh...@gmail.com>
AuthorDate: Fri Jan 17 13:14:43 2020 +0900

    extact receiveBody methods (#3486)
---
 .../camel/impl/engine/DefaultConsumerTemplate.java | 24 +++++++---------------
 1 file changed, 7 insertions(+), 17 deletions(-)

diff --git 
a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultConsumerTemplate.java
 
b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultConsumerTemplate.java
index b5d6652..430db05 100644
--- 
a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultConsumerTemplate.java
+++ 
b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultConsumerTemplate.java
@@ -110,14 +110,7 @@ public class DefaultConsumerTemplate extends 
ServiceSupport implements ConsumerT
 
     @Override
     public Object receiveBody(String endpointUri) {
-        Object answer;
-        Exchange exchange = receive(endpointUri);
-        try {
-            answer = extractResultBody(exchange);
-        } finally {
-            doneUoW(exchange);
-        }
-        return answer;
+        return receiveBody(receive(endpointUri));
     }
 
     @Override
@@ -127,14 +120,7 @@ public class DefaultConsumerTemplate extends 
ServiceSupport implements ConsumerT
 
     @Override
     public Object receiveBody(String endpointUri, long timeout) {
-        Object answer;
-        Exchange exchange = receive(endpointUri, timeout);
-        try {
-            answer = extractResultBody(exchange);
-        } finally {
-            doneUoW(exchange);
-        }
-        return answer;
+        return receiveBody(receive(endpointUri, timeout));
     }
 
     @Override
@@ -144,8 +130,11 @@ public class DefaultConsumerTemplate extends 
ServiceSupport implements ConsumerT
 
     @Override
     public Object receiveBodyNoWait(String endpointUri) {
+        return receiveBody(receiveNoWait(endpointUri));
+    }
+
+    private Object receiveBody(Exchange exchange) {
         Object answer;
-        Exchange exchange = receiveNoWait(endpointUri);
         try {
             answer = extractResultBody(exchange);
         } finally {
@@ -154,6 +143,7 @@ public class DefaultConsumerTemplate extends ServiceSupport 
implements ConsumerT
         return answer;
     }
 
+
     @Override
     public Object receiveBodyNoWait(Endpoint endpoint) {
         return receiveBodyNoWait(endpoint.getEndpointUri());