Repository: olingo-odata2 Updated Branches: refs/heads/master 713a4b311 -> 17beae0d0
[OLINGO-1176]Missing null check in JPA Project: http://git-wip-us.apache.org/repos/asf/olingo-odata2/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata2/commit/17beae0d Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata2/tree/17beae0d Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata2/diff/17beae0d Branch: refs/heads/master Commit: 17beae0d06d047140b4453dec0136484144008bd Parents: 713a4b3 Author: ramya vasanth <[email protected]> Authored: Tue Feb 6 11:44:21 2018 +0530 Committer: ramya vasanth <[email protected]> Committed: Tue Feb 6 11:44:21 2018 +0530 ---------------------------------------------------------------------- .../core/access/model/JPAEdmMappingModelService.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/17beae0d/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 761fc2d..846ecbd 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 @@ -202,13 +202,15 @@ public class JPAEdmMappingModelService implements JPAEdmMappingModelAccess { } private JPAEmbeddableTypeMapType searchJPAEmbeddableTypeMapType(final String jpaEmbeddableTypeName) { - for (JPAEmbeddableTypeMapType jpaEmbeddableType : mappingModel.getPersistenceUnit().getJPAEmbeddableTypes() - .getJPAEmbeddableType()) { - if (jpaEmbeddableType.getName().equals(jpaEmbeddableTypeName)) { - return jpaEmbeddableType; + if (null != mappingModel.getPersistenceUnit() && + null != mappingModel.getPersistenceUnit().getJPAEmbeddableTypes()) { + for (JPAEmbeddableTypeMapType jpaEmbeddableType : mappingModel.getPersistenceUnit().getJPAEmbeddableTypes() + .getJPAEmbeddableType()) { + if (jpaEmbeddableType.getName().equals(jpaEmbeddableTypeName)) { + return jpaEmbeddableType; + } } } - return null; }
