Author: xavier Date: Wed Jul 1 05:55:38 2009 New Revision: 790046 URL: http://svn.apache.org/viewvc?rev=790046&view=rev Log: FIX: NPE when a conf is unknown (related to IVY-983)
Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/IvyNodeCallers.java Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/IvyNodeCallers.java URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/IvyNodeCallers.java?rev=790046&r1=790045&r2=790046&view=diff ============================================================================== --- ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/IvyNodeCallers.java (original) +++ ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/IvyNodeCallers.java Wed Jul 1 05:55:38 2009 @@ -60,10 +60,12 @@ public void addConfiguration(String callerConf, String[] dependencyConfs) { updateConfs(callerConf, dependencyConfs); Configuration conf = md.getConfiguration(callerConf); - String[] confExtends = conf.getExtends(); - if (confExtends != null) { - for (int i = 0; i < confExtends.length; i++) { - addConfiguration(confExtends[i], dependencyConfs); + if (conf != null) { + String[] confExtends = conf.getExtends(); + if (confExtends != null) { + for (int i = 0; i < confExtends.length; i++) { + addConfiguration(confExtends[i], dependencyConfs); + } } } }