You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by dm...@apache.org on 2019/01/25 10:14:51 UTC
[camel] branch camel-2.x updated: CAMEL-13077: Fix polling return
for empty OData ODataFeeds (#2719) Closes #2732
This is an automated email from the ASF dual-hosted git repository.
dmvolod pushed a commit to branch camel-2.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-2.x by this push:
new ab8d5a3 CAMEL-13077: Fix polling return for empty OData ODataFeeds (#2719) Closes #2732
ab8d5a3 is described below
commit ab8d5a3bdce6291e14849aa3456eaca38c4bfe70
Author: phantomjinx <p....@phantomjinx.co.uk>
AuthorDate: Thu Jan 24 11:54:19 2019 +0000
CAMEL-13077: Fix polling return for empty OData ODataFeeds (#2719)
Closes #2732
* ApiConsumerHelper does not recognise ODataFeeds and thus defaults
to return a constant 1. This means that the scheduling polling is never
concluded to be idle and the backoffXXX consumer properties do not work.
* If the ODataFeed is empty then return 0 to allow for backoffXXX
properties
* This is an equivalent change to that already committed for olingo4
component.
---
.../org/apache/camel/component/olingo2/Olingo2Consumer.java | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Consumer.java b/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Consumer.java
index 3536c4a..ff108c5 100644
--- a/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Consumer.java
+++ b/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Consumer.java
@@ -27,6 +27,8 @@ import org.apache.camel.component.olingo2.internal.Olingo2ApiName;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.component.AbstractApiConsumer;
import org.apache.camel.util.component.ApiConsumerHelper;
+import org.apache.olingo.odata2.api.ep.feed.ODataFeed;
+
/**
* The Olingo2 consumer.
@@ -82,7 +84,15 @@ public class Olingo2Consumer extends AbstractApiConsumer<Olingo2ApiName, Olingo2
throw error[0];
}
- return ApiConsumerHelper.getResultsProcessed(this, result[0], isSplitResult());
+ //
+ // Allow consumer idle properties to properly handle an empty polling response
+ //
+ if (result[0] instanceof ODataFeed && (((ODataFeed) result[0]).getEntries().isEmpty())) {
+ return 0;
+ } else {
+ int processed = ApiConsumerHelper.getResultsProcessed(this, result[0], isSplitResult());
+ return processed;
+ }
} catch (Throwable t) {
throw ObjectHelper.wrapRuntimeCamelException(t);