You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by dj...@apache.org on 2010/06/24 19:39:32 UTC
svn commit: r957646 -
/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/CmpJpaConversion.java
Author: djencks
Date: Thu Jun 24 17:39:32 2010
New Revision: 957646
URL: http://svn.apache.org/viewvc?rev=957646&view=rev
Log:
avoid a possible NPE
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/CmpJpaConversion.java
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/CmpJpaConversion.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/CmpJpaConversion.java?rev=957646&r1=957645&r2=957646&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/CmpJpaConversion.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/CmpJpaConversion.java Thu Jun 24 17:39:32 2010
@@ -132,7 +132,7 @@ public class CmpJpaConversion implements
// TODO: This should not be necessary, but having an empty <attributes/> tag
// causes some of the unit tests to fail. Not sure why. Should be fixed.
for (Entity entity : appModule.getCmpMappings().getEntity()) {
- if (entity.getAttributes().isEmpty()){
+ if (entity.getAttributes() != null && entity.getAttributes().isEmpty()){
entity.setAttributes(null);
}
}