[OLINGO-941] Fixed NPE for navigation property selection
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata2/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata2/commit/768bc4c6 Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata2/tree/768bc4c6 Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata2/diff/768bc4c6 Branch: refs/heads/OLINGO-882_EnableContainerManagedPersistence Commit: 768bc4c65f0869d89b02349f5b9bfffd2abc378d Parents: f87b681 Author: mibo <[email protected]> Authored: Mon Apr 25 20:35:39 2016 +0200 Committer: mibo <[email protected]> Committed: Mon Apr 25 20:35:39 2016 +0200 ---------------------------------------------------------------------- .../jpa/processor/core/ODataJPAResponseBuilderDefault.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/768bc4c6/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 3b43001..0517e48 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 @@ -622,12 +622,12 @@ public final class ODataJPAResponseBuilderDefault implements ODataJPAResponseBui for (EdmProperty keyProperty : entity.getKeyProperties()) { flag = true; for (SelectItem selectedItem : selectItems) { - if (selectedItem.isStar() == false && selectedItem.getProperty().equals(keyProperty)) { + if (!selectedItem.isStar() && keyProperty.equals(selectedItem.getProperty())) { flag = false; break; } } - if (flag == true) { + if (flag) { selectPropertyList.add(keyProperty); } }
