svn commit: r1531892 - /tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/OpenEjb2Conversion.java

[andygumbrecht]

Author: andygumbrecht
Date: Mon Oct 14 13:40:04 2013
New Revision: 1531892

URL: http://svn.apache.org/r1531892
Log:
More for https://issues.apache.org/jira/browse/OPENEJB-2042

Modified:
    
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/OpenEjb2Conversion.java

Modified: 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/OpenEjb2Conversion.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/OpenEjb2Conversion.java?rev=1531892&r1=1531891&r2=1531892&view=diff
==============================================================================
--- 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/OpenEjb2Conversion.java
 (original)
+++ 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/OpenEjb2Conversion.java
 Mon Oct 14 13:40:04 2013
@@ -365,17 +365,21 @@ public class OpenEjb2Conversion implemen
                 final EjbRelationshipRoleType.RelationshipRoleSource 
leftRoleSource = leftRole.getRelationshipRoleSource();
                 final String leftEjbName = leftRoleSource == null ? null : 
leftRoleSource.getEjbName();
                 final EntityData leftEntityData = entities.get(moduleId + "#" 
+ leftEjbName);
-                final String leftFieldName = 
leftRole.getCmrField().getCmrFieldName();
+                final EjbRelationshipRoleType.CmrField cmrField = 
leftRole.getCmrField();
+
+                final String leftFieldName = (null != cmrField ? 
cmrField.getCmrFieldName() : null);
 
                 RelationField field;
                 if (leftRole.isForeignKeyColumnOnSource()) {
-                    field = leftEntityData.relations.get(leftFieldName);
+
+                    field = (null != leftFieldName && null != leftEntityData ? 
leftEntityData.relations.get(leftFieldName) : null);
+
                     // todo warn field not found
                     if (field == null) {
                         continue;
                     }
                 } else {
-                    final RelationField other = 
leftEntityData.relations.get(leftFieldName);
+                    final RelationField other = (null != leftFieldName && null 
!= leftEntityData ? leftEntityData.relations.get(leftFieldName) : null);
                     // todo warn field not found
                     if (other == null) {
                         continue;