Repository: olingo-odata2 Updated Branches: refs/heads/master 4facec58b -> 307abde3a
[OLINGO-842] Fixed wrong JPA behavior Project: http://git-wip-us.apache.org/repos/asf/olingo-odata2/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata2/commit/307abde3 Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata2/tree/307abde3 Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata2/diff/307abde3 Branch: refs/heads/master Commit: 307abde3a90fc567233d79ad31383d11fa0d72b3 Parents: 4facec5 Author: mibo <[email protected]> Authored: Sun Dec 20 09:50:09 2015 +0100 Committer: mibo <[email protected]> Committed: Sun Dec 20 09:50:09 2015 +0100 ---------------------------------------------------------------------- .../jpa/processor/core/ODataJPAResponseBuilderDefault.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/307abde3/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/ODataJPAResponseBuilderDefault.java ---------------------------------------------------------------------- diff --git a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/ODataJPAResponseBuilderDefault.java b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/ODataJPAResponseBuilderDefault.java index edec5fb..3b43001 100644 --- a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/ODataJPAResponseBuilderDefault.java +++ b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/ODataJPAResponseBuilderDefault.java @@ -295,7 +295,7 @@ public final class ODataJPAResponseBuilderDefault implements ODataJPAResponseBui ODataResponse odataResponse = null; - if (resultList != null && !resultList.isEmpty()) { + if (resultList != null) { JPAEntityParser jpaResultParser = new JPAEntityParser(); EdmType edmType = null; EdmFunctionImport functionImport = null; @@ -303,9 +303,7 @@ public final class ODataJPAResponseBuilderDefault implements ODataJPAResponseBui List<Map<String, Object>> edmEntityList = null; Object result = null; try { - EntityProviderWriteProperties feedProperties = null; - - feedProperties = + EntityProviderWriteProperties feedProperties = EntityProviderWriteProperties.serviceRoot(oDataJPAContext.getODataContext().getPathInfo().getServiceRoot()) .build();
