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/13 11:09:28 UTC
[3/3] tomee git commit: fixes lines at CmpJpaConversion
fixes lines at CmpJpaConversion
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/e26828c7
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/e26828c7
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/e26828c7
Branch: refs/heads/master
Commit: e26828c7e13d116cbda41b777be07750c4b3ecfb
Parents: 4859fa8
Author: Otavio Santana <ot...@gmail.com>
Authored: Thu Dec 13 08:53:01 2018 -0200
Committer: Otavio Santana <ot...@gmail.com>
Committed: Thu Dec 13 08:53:01 2018 -0200
----------------------------------------------------------------------
.../src/main/java/org/apache/openejb/config/CmpJpaConversion.java | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/e26828c7/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 9796120..dd5ae82 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
@@ -267,11 +267,9 @@ public class CmpJpaConversion implements DynamicDeployer {
private String getPersistenceModuleId(final AppModule appModule) {
if (appModule.getModuleId() != null) {
-
return Optional.ofNullable(appModule.getJarLocation()).orElse(appModule.getModuleId());
}
for (final EjbModule ejbModule : appModule.getEjbModules()) {
- //return ejbModule.getJarLocation();
return Optional.ofNullable(appModule.getJarLocation()).orElse(appModule.getModuleId());
}
throw new IllegalStateException("Comp must be in an ejb module, this one has none: " + appModule);