Adds getModuleId method as a fallback when getJarLocation is null at CmpJpaConversion
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/2969abe8 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/2969abe8 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/2969abe8 Branch: refs/heads/tomee-7.1.x Commit: 2969abe805e15a3b6fe76454bd87c283f9fb488d Parents: a268f5e Author: Otavio Santana <[email protected]> Authored: Thu Dec 13 08:50:56 2018 -0200 Committer: Otavio Santana <[email protected]> Committed: Mon Dec 17 14:01:29 2018 -0200 ---------------------------------------------------------------------- .../java/org/apache/openejb/config/CmpJpaConversion.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/2969abe8/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 b45de3e..d14d7e3 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 @@ -76,6 +76,8 @@ import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Objects; +import java.util.Optional; import java.util.Properties; import java.util.Set; import java.util.TreeMap; @@ -266,10 +268,12 @@ public class CmpJpaConversion implements DynamicDeployer { private String getPersistenceModuleId(final AppModule appModule) { if (appModule.getModuleId() != null) { - return appModule.getJarLocation(); + + return Optional.ofNullable(appModule.getJarLocation()).orElse(appModule.getModuleId()); } for (final EjbModule ejbModule : appModule.getEjbModules()) { - return ejbModule.getJarLocation(); + //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); }
