You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@tomee.apache.org by rm...@apache.org on 2012/12/19 14:03:26 UTC

svn commit: r1423851 - /openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/PersistenceUnitLinkResolver.java

Author: rmannibucau
Date: Wed Dec 19 13:03:25 2012
New Revision: 1423851

URL: http://svn.apache.org/viewvc?rev=1423851&view=rev
Log:
NPE check

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

Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/PersistenceUnitLinkResolver.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/PersistenceUnitLinkResolver.java?rev=1423851&r1=1423850&r2=1423851&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/PersistenceUnitLinkResolver.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/PersistenceUnitLinkResolver.java Wed Dec 19 13:03:25 2012
@@ -99,7 +99,7 @@ public class PersistenceUnitLinkResolver
     }
 
     private WebModule extractWebApp(final URI moduleUri) {
-        if (module == null) {
+        if (module == null || module.getJarLocation() == null) {
             return null;
         }
 
@@ -113,7 +113,7 @@ public class PersistenceUnitLinkResolver
         }
 
         for (WebModule webModule : module.getWebModules()) {
-            if (isParent(new File(webModule.getJarLocation()), moduleFile, appModuleFile)) {
+            if (webModule.getJarLocation() != null && isParent(new File(webModule.getJarLocation()), moduleFile, appModuleFile)) {
                 return webModule;
             }
         }