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/03/26 10:05:11 UTC
[1/2] olingo-odata2 git commit: Fix Entity Manager close issue for
injected entity managers
Repository: olingo-odata2
Updated Branches:
refs/heads/master f10670a8a -> 763755f1a
Fix Entity Manager close issue for injected entity managers
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/c700b070
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata2/tree/c700b070
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata2/diff/c700b070
Branch: refs/heads/master
Commit: c700b070bf71b56e26807f9109811ed2a4102f33
Parents: 345b33d
Author: Chandan V A <ch...@sap.com>
Authored: Thu Mar 26 14:32:07 2015 +0530
Committer: Chandan V A <ch...@sap.com>
Committed: Thu Mar 26 14:32:07 2015 +0530
----------------------------------------------------------------------
.../jpa/processor/core/access/data/JPAProcessorImpl.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/c700b070/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 477edff..da5a1e1 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
@@ -418,8 +418,10 @@ public class JPAProcessorImpl implements JPAProcessor {
Query query = null;
try {
query = em.createQuery(selectJPQLStatement.toString());
- if (!query.getResultList().isEmpty()) {
- selectedObject = query.getResultList().get(0);
+ @SuppressWarnings("rawtypes")
+ final List resultList = query.getResultList();
+ if (!resultList.isEmpty()) {
+ selectedObject = resultList.get(0);
}
} catch (IllegalArgumentException e) {
throw ODataJPARuntimeException.throwException(
[2/2] olingo-odata2 git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/olingo-odata2.git
Posted by ch...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/olingo-odata2.git
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata2/commit/763755f1
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata2/tree/763755f1
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata2/diff/763755f1
Branch: refs/heads/master
Commit: 763755f1a17019a62867326ae080ac0653ab0487
Parents: c700b07 f10670a
Author: Chandan V A <ch...@sap.com>
Authored: Thu Mar 26 14:34:30 2015 +0530
Committer: Chandan V A <ch...@sap.com>
Committed: Thu Mar 26 14:34:30 2015 +0530
----------------------------------------------------------------------
.../olingo/odata2/core/servlet/RestUtil.java | 4 +-
.../odata2/core/servlet/RestUtilTest.java | 59 ++++++++++++++++++++
2 files changed, 61 insertions(+), 2 deletions(-)
----------------------------------------------------------------------