This is an automated email from the ASF dual-hosted git repository.
mibo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/olingo-odata4.git
The following commit(s) were added to refs/heads/master by this push:
new f4a6bae OLINGO-1400 - remove duplicate call to
provider.getEntityContainer() in EdmProviderImpl.createEntityContainer
new 43010c7 Merge pull request #56 from ianwallen/OLINGO-1400
f4a6bae is described below
commit f4a6baeaeeb0acde65d3a6aaf3e14f02f6d3ae36
Author: Ian Allen <[email protected]>
AuthorDate: Thu Sep 26 10:38:44 2019 -0300
OLINGO-1400 - remove duplicate call to provider.getEntityContainer() in
EdmProviderImpl.createEntityContainer
---
.../java/org/apache/olingo/commons/core/edm/EdmProviderImpl.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git
a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmProviderImpl.java
b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmProviderImpl.java
index abd17da..bf5ea7d 100644
---
a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmProviderImpl.java
+++
b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmProviderImpl.java
@@ -86,9 +86,10 @@ public class EdmProviderImpl extends AbstractEdm {
try {
CsdlEntityContainerInfo entityContainerInfo =
provider.getEntityContainerInfo(containerName);
if (entityContainerInfo != null) {
- addEntityContainerAnnotations(provider.getEntityContainer(),
entityContainerInfo.getContainerName());
+ CsdlEntityContainer entityContainer = provider.getEntityContainer();
+ addEntityContainerAnnotations(entityContainer,
entityContainerInfo.getContainerName());
return new EdmEntityContainerImpl(this, provider,
entityContainerInfo.getContainerName(),
- provider.getEntityContainer());
+ entityContainer);
}
return null;
} catch (ODataException e) {
