Author: brett
Date: Mon Jul 14 03:36:25 2014
New Revision: 1610336
URL: http://svn.apache.org/r1610336
Log:
[NPANDAY-632] NPE when using netHome maven configuration
Make sure executableConfig is always initialised with a list for
executablePaths before attempting to add netHome to the list
Submitted by: Greg Domjan
Modified:
incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/impl/NetExecutableFactoryImpl.java
Modified:
incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/impl/NetExecutableFactoryImpl.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/impl/NetExecutableFactoryImpl.java?rev=1610336&r1=1610335&r2=1610336&view=diff
==============================================================================
---
incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/impl/NetExecutableFactoryImpl.java
(original)
+++
incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/impl/NetExecutableFactoryImpl.java
Mon Jul 14 03:36:25 2014
@@ -85,6 +85,8 @@ public class NetExecutableFactoryImpl
? new ArrayList<String>()
: executableConfig.getExecutionPaths();
+ executableConfig.setExecutionPaths( executablePaths );
+
if ( netHome != null )
{
getLogger().info( "NPANDAY-066-014: Found executable path in pom:
Path = " + netHome.getAbsolutePath() );
@@ -92,8 +94,6 @@ public class NetExecutableFactoryImpl
}
- executableConfig.setExecutionPaths( executablePaths );
-
final ExecutableCapability executableCapability =
capabilityMatcher.matchExecutableCapabilityFor(
executableRequirement );