Repository: olingo-odata2 Updated Branches: refs/heads/master 992e42469 -> 36a3eb6f6
Fix NPE in JUnit Signed-off-by: Chandan V A <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/olingo-odata2/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata2/commit/36a3eb6f Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata2/tree/36a3eb6f Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata2/diff/36a3eb6f Branch: refs/heads/master Commit: 36a3eb6f6a7defa1436503b9281873ee16d20437 Parents: 992e424 Author: Chandan V A <[email protected]> Authored: Tue May 19 18:05:28 2015 +0530 Committer: Chandan V A <[email protected]> Committed: Tue May 19 18:05:28 2015 +0530 ---------------------------------------------------------------------- .../processor/core/access/model/JPAEdmMappingModelService.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/36a3eb6f/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/model/JPAEdmMappingModelService.java ---------------------------------------------------------------------- diff --git a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/model/JPAEdmMappingModelService.java b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/model/JPAEdmMappingModelService.java index 33e3fff..761fc2d 100644 --- a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/model/JPAEdmMappingModelService.java +++ b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/model/JPAEdmMappingModelService.java @@ -83,9 +83,11 @@ public class JPAEdmMappingModelService implements JPAEdmMappingModelAccess { ODataJPAModelException.throwException(ODataJPAModelException.GENERAL, e); } finally { try { - is.close(); + if (is != null) { + is.close(); + } } catch (IOException e) { - //do nothing + // do nothing } } }
