commit d32a900a45e77ae41eeb6962755cda0e6452d3be
author mibo <mibo@apache.org> Mon Oct 15 22:04:02 2018 +0200
committer mibo <mibo@apache.org> Tue Oct 16 21:04:41 2018 +0200
tree 72d9a76b8fed541af1c9896837358584fff218cd
parent efff5d910493143a8a962ac1fd67b1a91ac962c5

[OLINGO-1301] Fix for metadata redefine

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..69153ec 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,9 @@
     if (mappingModelStream != null) {
       return mappingModelStream;
     }
-    return JPAEdmMappingModelService.class.getClassLoader().getResourceAsStream("../../" + mappingModelName);
-
+    ClassLoader classLoader = JPAEdmMappingModelService.class.getClassLoader();
+    InputStream modelStream = classLoader.getResourceAsStream("../../" + mappingModelName);
+    return (modelStream != null) ? modelStream : classLoader.getResourceAsStream(mappingModelName);
   }
 
   @Override