You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jg...@apache.org on 2018/12/19 22:11:12 UTC
[28/30] tomee git commit: Adds getModuleId method as a fallback when
getJarLocation is null at
Adds getModuleId method as a fallback when getJarLocation is null at
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/483915b3
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/483915b3
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/483915b3
Branch: refs/heads/tomee-7.1.x
Commit: 483915b3a31f6853a57f47cc79056b482473733c
Parents: 7f19ea9
Author: Otavio Santana <ot...@gmail.com>
Authored: Mon Dec 17 14:05:01 2018 -0200
Committer: Otavio Santana <ot...@gmail.com>
Committed: Mon Dec 17 14:05:01 2018 -0200
----------------------------------------------------------------------
.../main/java/org/apache/openejb/config/CmpJpaConversion.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/483915b3/container/openejb-core/src/main/java/org/apache/openejb/config/CmpJpaConversion.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/CmpJpaConversion.java b/container/openejb-core/src/main/java/org/apache/openejb/config/CmpJpaConversion.java
index 2965abe..6d6331c 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/CmpJpaConversion.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/CmpJpaConversion.java
@@ -266,10 +266,10 @@ public class CmpJpaConversion implements DynamicDeployer {
private String getPersistenceModuleId(final AppModule appModule) {
if (appModule.getModuleId() != null) {
- return appModule.getJarLocation();
+ return appModule.getJarLocation() == null ? appModule.getModuleId() : appModule.getJarLocation();
}
for (final EjbModule ejbModule : appModule.getEjbModules()) {
- return ejbModule.getJarLocation();
+ return appModule.getJarLocation() == null ? appModule.getModuleId() : appModule.getJarLocation();
}
throw new IllegalStateException("Comp must be in an ejb module, this one has none: " + appModule);
}