Repository: olingo-odata2 Updated Branches: refs/heads/OLINGO-1301 865d54432 -> be93558ff (forced update)
[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/be93558f Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata2/tree/be93558f Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata2/diff/be93558f Branch: refs/heads/OLINGO-1301 Commit: be93558ffe27eff7864f52ee4e3e43171a2da50d Parents: efff5d9 Author: mibo <m...@apache.org> Authored: Mon Oct 15 22:04:02 2018 +0200 Committer: mibo <m...@apache.org> Committed: Tue Oct 16 21:02:07 2018 +0200 ---------------------------------------------------------------------- .../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/be93558f/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..7667d46 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,10 @@ 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
