You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by ch...@apache.org on 2015/08/22 16:23:17 UTC
olingo-odata2 git commit: [OLINGO-764] - Fix for generating Delta
Tokens
Repository: olingo-odata2
Updated Branches:
refs/heads/master cb5829cce -> 14d97bf86
[OLINGO-764] - Fix for generating Delta Tokens
Signed-off-by: Chandan V A <ch...@sap.com>
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata2/commit/14d97bf8
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata2/tree/14d97bf8
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata2/diff/14d97bf8
Branch: refs/heads/master
Commit: 14d97bf86a3b7b63882d1bc8bc3c5e91d03d412b
Parents: cb5829c
Author: Chandan V A <ch...@sap.com>
Authored: Sat Aug 22 19:53:06 2015 +0530
Committer: Chandan V A <ch...@sap.com>
Committed: Sat Aug 22 19:53:06 2015 +0530
----------------------------------------------------------------------
.../odata2/jpa/processor/core/access/data/JPAProcessorImpl.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/14d97bf8/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAProcessorImpl.java
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAProcessorImpl.java b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAProcessorImpl.java
index ad8810c..195153b 100644
--- a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAProcessorImpl.java
+++ b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAProcessorImpl.java
@@ -161,10 +161,12 @@ public class JPAProcessorImpl implements JPAProcessor {
List<Object> deltaResult =
(List<Object>) ODataJPATombstoneContext.getDeltaResult(((EdmMapping) mapping).getInternalName());
result = handlePaging(deltaResult, uriParserResultView);
- ODataJPATombstoneContext.setDeltaToken(listener.generateDeltaToken((List<Object>) result, query));
} else {
result = handlePaging(query, uriParserResultView);
}
+ if (listener != null && listener.isTombstoneSupported()) {
+ ODataJPATombstoneContext.setDeltaToken(listener.generateDeltaToken((List<Object>) result, query));
+ }
return result == null ? new ArrayList<Object>() : result;
} catch (EdmException e) {
throw ODataJPARuntimeException.throwException(