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 2013/11/25 14:23:06 UTC

svn commit: r1545259 - /tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java

Author: rmannibucau
Date: Mon Nov 25 13:23:06 2013
New Revision: 1545259

URL: http://svn.apache.org/r1545259
Log:
TOMEE-1088 NPE protection for classpaths in run()

Modified:
    tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java

Modified: tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java?rev=1545259&r1=1545258&r2=1545259&view=diff
==============================================================================
--- tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java (original)
+++ tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java Mon Nov 25 13:23:06 2013
@@ -632,6 +632,10 @@ public abstract class AbstractTomEEMojo 
     }
 
     protected void run() {
+        if (classpaths == null) { // NPE protection when execute is skipped and mojo delegates to run directly
+            classpaths = new ArrayList<String>();
+        }
+
         final String deployOpenEjbAppKey = "openejb.system.apps";
         final String servletCompliance = "org.apache.catalina.STRICT_SERVLET_COMPLIANCE";