ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jlboud...@apache.org
Subject svn commit: r1503123 - /ant/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/SubModule.java
Date Mon, 15 Jul 2013 07:15:09 GMT
Author: jlboudart
Date: Mon Jul 15 07:15:09 2013
New Revision: 1503123

URL: http://svn.apache.org/r1503123
Log:
Fix potential NPE on submodules if buildtype isn't properly loaded

Modified:
    ant/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/SubModule.java

Modified: ant/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/SubModule.java
URL: http://svn.apache.org/viewvc/ant/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/SubModule.java?rev=1503123&r1=1503122&r2=1503123&view=diff
==============================================================================
--- ant/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/SubModule.java (original)
+++ ant/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/SubModule.java Mon Jul 15
07:15:09 2013
@@ -31,9 +31,9 @@ import java.util.Vector;
 import org.apache.easyant.core.EasyAntConstants;
 import org.apache.easyant.core.EasyAntMagicNames;
 import org.apache.easyant.core.ant.ProjectUtils;
+import org.apache.easyant.core.ant.listerners.BuildExecutionTimer.ExecutionResult;
 import org.apache.easyant.core.ant.listerners.MultiModuleLogger;
 import org.apache.easyant.core.ant.listerners.SubBuildExecutionTimer;
-import org.apache.easyant.core.ant.listerners.BuildExecutionTimer.ExecutionResult;
 import org.apache.easyant.core.ivy.IvyInstanceHelper;
 import org.apache.ivy.ant.IvyPublish;
 import org.apache.ivy.ant.IvyResolve;
@@ -203,7 +203,11 @@ public class SubModule extends AbstractE
                 subModule.setNewProperty(EasyAntMagicNames.PROJECT_EXECUTED_TARGETS, targetsToRun);
                 subModule.executeTargets(new TargetList(targetsToRun));
                 if (useBuildRepository) {
-                    File artifactsDir = subModule.resolveFile(subModule.getProperty("target.artifacts"));
+                    String targetArtifacts = subModule.getProperty("target.artifacts");
+                    if (targetArtifacts == null) {
+                        targetArtifacts = "target/artifacts";
+                    }
+                    File artifactsDir = subModule.resolveFile(targetArtifacts);
                     if (artifactsDir.isDirectory()) {
                         IvyResolve ivyResolve = new IvyResolve();
                         ivyResolve.setFile(file);
@@ -298,8 +302,8 @@ public class SubModule extends AbstractE
         addReferences(subModule);
 
         getEasyAntEngine().configureEasyAntIvyInstance(subModule);
-        subModule.addReference(EasyAntMagicNames.PLUGIN_SERVICE_INSTANCE, getProject().getReference(
-                EasyAntMagicNames.PLUGIN_SERVICE_INSTANCE));
+        subModule.addReference(EasyAntMagicNames.PLUGIN_SERVICE_INSTANCE,
+                getProject().getReference(EasyAntMagicNames.PLUGIN_SERVICE_INSTANCE));
 
         subModule.setName(file.getName());
         subModule.setBaseDir(directory);



Mime
View raw message