Author: maartenc Date: Mon Dec 15 13:49:40 2008 New Revision: 726818 URL: http://svn.apache.org/viewvc?rev=726818&view=rev Log: FIX: NPE in LogReportOutputter (IVY-961) (merged from trunk)
Modified: ant/ivy/core/branches/2.0.x/ (props changed) ant/ivy/core/branches/2.0.x/CHANGES.txt ant/ivy/core/branches/2.0.x/src/java/org/apache/ivy/plugins/report/LogReportOutputter.java ant/ivy/core/branches/2.0.x/test/java/org/apache/ivy/ant/IvyResolveTest.java Propchange: ant/ivy/core/branches/2.0.x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Dec 15 13:49:40 2008 @@ -1,2 +1,2 @@ /ant/ivy/core/branches/2.0.0-rc2:707177-709027 -/ant/ivy/core/trunk:695737,696014-696031,696442,698318-706770,709027-709034,720308-720591 +/ant/ivy/core/trunk:695737,696014-696031,696442,698318-706770,709027-709034,709039-710178,720308-720591 Modified: ant/ivy/core/branches/2.0.x/CHANGES.txt URL: http://svn.apache.org/viewvc/ant/ivy/core/branches/2.0.x/CHANGES.txt?rev=726818&r1=726817&r2=726818&view=diff ============================================================================== --- ant/ivy/core/branches/2.0.x/CHANGES.txt (original) +++ ant/ivy/core/branches/2.0.x/CHANGES.txt Mon Dec 15 13:49:40 2008 @@ -86,6 +86,7 @@ - IMPROVEMENT: Ivy Standalone setting to overwrite publications (IVY-976) - FIX: Log levels aren't respected in certain cases using the standalone functionality (IVY-960) (thanks to Patrick Woodworth) +- FIX: NPE in LogReportOutputter (IVY-961) 2.0.0-rc2 ===================================== Modified: ant/ivy/core/branches/2.0.x/src/java/org/apache/ivy/plugins/report/LogReportOutputter.java URL: http://svn.apache.org/viewvc/ant/ivy/core/branches/2.0.x/src/java/org/apache/ivy/plugins/report/LogReportOutputter.java?rev=726818&r1=726817&r2=726818&view=diff ============================================================================== --- ant/ivy/core/branches/2.0.x/src/java/org/apache/ivy/plugins/report/LogReportOutputter.java (original) +++ ant/ivy/core/branches/2.0.x/src/java/org/apache/ivy/plugins/report/LogReportOutputter.java Mon Dec 15 13:49:40 2008 @@ -48,6 +48,7 @@ ResolveReport report, ResolutionCacheManager cacheMgr, ResolveOptions options) throws IOException { IvySettings settings = IvyContext.getContext().getSettings(); + if (settings.logModulesInUse() && ResolveOptions.LOG_DEFAULT.equals(options.getLog())) { Message.info("\t:: modules in use:"); List dependencies = new ArrayList(report.getDependencies()); @@ -56,7 +57,7 @@ String[] confs = report.getConfigurations(); for (int i = 0; i < dependencies.size(); i++) { IvyNode node = (IvyNode) dependencies.get(i); - if (node.isCompletelyEvicted()) { + if (node.isCompletelyEvicted() || node.hasProblem()) { continue; } List nodeConfs = new ArrayList(confs.length); Modified: ant/ivy/core/branches/2.0.x/test/java/org/apache/ivy/ant/IvyResolveTest.java URL: http://svn.apache.org/viewvc/ant/ivy/core/branches/2.0.x/test/java/org/apache/ivy/ant/IvyResolveTest.java?rev=726818&r1=726817&r2=726818&view=diff ============================================================================== --- ant/ivy/core/branches/2.0.x/test/java/org/apache/ivy/ant/IvyResolveTest.java (original) +++ ant/ivy/core/branches/2.0.x/test/java/org/apache/ivy/ant/IvyResolveTest.java Mon Dec 15 13:49:40 2008 @@ -241,6 +241,16 @@ } } + public void testIvyLogModulesInUseWithFailure() throws Exception { + resolve.getProject().setProperty("ivy.log.modules.in.use", "true"); + resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-failure.xml")); + resolve.setHaltonfailure(false); + resolve.execute(); + + // we did manage to get here, so no NPE has been thrown (IVY-961) + } + + public void testFailureWithMissingConfigurations() throws Exception { try { resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-simple.xml"));