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

[tv...@apache.org]

Author: tveronezi
Date: Fri Oct  3 10:21:51 2014
New Revision: 1629173

URL: http://svn.apache.org/r1629173
Log:
nullpointer fix

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

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java?rev=1629173&r1=1629172&r2=1629173&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java Fri Oct  3 10:21:51 2014
@@ -1365,6 +1365,10 @@ public class AutoConfig implements Dynam
             // first try exact matching without JtaManaged which is not mandatory actually (custom DS + JTADataSourceWrapperFactory)
             final String jtaWithJavaAndSlash = replaceJavaAndSlash(unit.getJtaDataSource());
             for (final String potentialName : asList(prefix + jtaWithJavaAndSlash, jtaWithJavaAndSlash)) {
+                if(potentialName == null) {
+                    // If unit.getJtaDataSource() is null, one of the potentialName is also null.
+                    continue;
+                }
                 final ResourceInfo jtaInfo = configFactory.getResourceInfo(potentialName);
                 if (jtaInfo != null) {
                     if (!"false".equalsIgnoreCase(jtaInfo.properties.getProperty("JtaManaged")) // don't test true since it can be missing
@@ -1379,6 +1383,10 @@ public class AutoConfig implements Dynam
 
             final String nonJtaWithJavaAndSlash = replaceJavaAndSlash(unit.getNonJtaDataSource());
             for (final String potentialName : asList(prefix + nonJtaWithJavaAndSlash, nonJtaWithJavaAndSlash)) {
+                if(potentialName == null) {
+                    // If unit.getNonJtaDataSource() is null, one of the potentialName is also null.
+                    continue;
+                }
                 final ResourceInfo info = configFactory.getResourceInfo(potentialName);
                 if (info != null) {
                     if (!"true".equalsIgnoreCase(info.properties.getProperty("JtaManaged"))