Repository: olingo-odata2 Updated Branches: refs/heads/OLINGO-1301 [created] 865d54432
[OLINGO-1301] Fix for metadata redefine Project: http://git-wip-us.apache.org/repos/asf/olingo-odata2/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata2/commit/865d5443 Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata2/tree/865d5443 Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata2/diff/865d5443 Branch: refs/heads/OLINGO-1301 Commit: 865d54432227ff6a5915c338a203ce3a42938f89 Parents: efff5d9 Author: mibo <[email protected]> Authored: Mon Oct 15 22:04:02 2018 +0200 Committer: mibo <[email protected]> Committed: Mon Oct 15 22:04:02 2018 +0200 ---------------------------------------------------------------------- .../processor/core/access/model/JPAEdmMappingModelService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/865d5443/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 846ecbd..e656086 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 @@ -218,8 +218,8 @@ public class JPAEdmMappingModelService implements JPAEdmMappingModelAccess { if (mappingModelStream != null) { return mappingModelStream; } - return JPAEdmMappingModelService.class.getClassLoader().getResourceAsStream("../../" + mappingModelName); - + InputStream modelStream = JPAEdmMappingModelService.class.getClassLoader().getResourceAsStream("../../" + mappingModelName); + return (modelStream != null) ? modelStream : JPAEdmMappingModelService.class.getClassLoader().getResourceAsStream(mappingModelName); } @Override
