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/06 17:33:25 UTC
[03/24] tomee git commit: TOMEE-2295 PMD
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/a2202439
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/a2202439
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/a2202439
Branch: refs/heads/master
Commit: a220243932db5968a78d6a08c7ab238b350b368b
Parents: ddbae44
Author: Jonathan Gallimore <jo...@jrg.me.uk>
Authored: Wed Nov 28 20:00:45 2018 +0000
Committer: Jonathan Gallimore <jo...@jrg.me.uk>
Committed: Wed Nov 28 20:00:45 2018 +0000
----------------------------------------------------------------------
.../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/a2202439/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) {