TOMEE-2295 PMD
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/e7c5755c Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/e7c5755c Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/e7c5755c Branch: refs/heads/tomee-7.1.x Commit: e7c5755c4d16f3575f2829359b37023db94c3b1f Parents: b82b8e8 Author: Jonathan Gallimore <[email protected]> Authored: Wed Nov 28 20:00:45 2018 +0000 Committer: Otavio Santana <[email protected]> Committed: Mon Dec 17 13:56:12 2018 -0200 ---------------------------------------------------------------------- .../src/main/java/org/apache/openejb/config/CmpJpaConversion.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/e7c5755c/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 194bbd9..eca9896 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 @@ -134,7 +134,7 @@ public class CmpJpaConversion implements DynamicDeployer { // check for an existing "cmp" persistence unit, and look at existing mappings final PersistenceUnit cmpPersistenceUnit = findCmpPersistenceUnit(appModule); if (cmpPersistenceUnit != null) { - if (cmpPersistenceUnit.getMappingFile() != null || cmpPersistenceUnit.getMappingFile().size() > 0) { + if (cmpPersistenceUnit.getMappingFile() != null && cmpPersistenceUnit.getMappingFile().size() > 0) { for (final String mappingFile : cmpPersistenceUnit.getMappingFile()) { final EntityMappings entityMappings = readEntityMappings(mappingFile); if (entityMappings != null) {
