Return-Path: Delivered-To: apmail-ant-notifications-archive@locus.apache.org Received: (qmail 6368 invoked from network); 15 Jan 2008 17:54:48 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 15 Jan 2008 17:54:48 -0000 Received: (qmail 62349 invoked by uid 500); 15 Jan 2008 17:54:38 -0000 Delivered-To: apmail-ant-notifications-archive@ant.apache.org Received: (qmail 62320 invoked by uid 500); 15 Jan 2008 17:54:38 -0000 Mailing-List: contact notifications-help@ant.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ant.apache.org Delivered-To: mailing list notifications@ant.apache.org Received: (qmail 62161 invoked by uid 99); 15 Jan 2008 17:54:38 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 15 Jan 2008 09:54:38 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 15 Jan 2008 17:54:21 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 8F5821A983A; Tue, 15 Jan 2008 09:54:27 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r612175 - in /ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver: AbstractResourceResolver.java util/ResourceMDParser.java Date: Tue, 15 Jan 2008 17:54:26 -0000 To: notifications@ant.apache.org From: xavier@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080115175427.8F5821A983A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: xavier Date: Tue Jan 15 09:54:25 2008 New Revision: 612175 URL: http://svn.apache.org/viewvc?rev=612175&view=rev Log: FIX: NPE while resolving dependencies (IVY-701) Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/AbstractResourceResolver.java ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/util/ResourceMDParser.java Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/AbstractResourceResolver.java URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/AbstractResourceResolver.java?rev=612175&r1=612174&r2=612175&view=diff ============================================================================== --- ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/AbstractResourceResolver.java (original) +++ ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/AbstractResourceResolver.java Tue Jan 15 09:54:25 2008 @@ -158,6 +158,12 @@ } if (versionMatcher.needModuleDescriptor(mrid, foundMrid)) { ResolvedResource r = rmdparser.parse(rres.getResource(), rres.getRevision()); + if (r == null) { + Message.debug("\t" + name + + ": impossible to get module descriptor resource: " + rres); + rejected.add(rres.getRevision() + " (no or bad MD)"); + continue; + } ModuleDescriptor md = ((MDResolvedResource) r).getResolvedModuleRevision() .getDescriptor(); if (md.isDefault()) { Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/util/ResourceMDParser.java URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/util/ResourceMDParser.java?rev=612175&r1=612174&r2=612175&view=diff ============================================================================== --- ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/util/ResourceMDParser.java (original) +++ ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/util/ResourceMDParser.java Tue Jan 15 09:54:25 2008 @@ -20,5 +20,15 @@ import org.apache.ivy.plugins.repository.Resource; public interface ResourceMDParser { + /** + * Parses the module descriptor designed by the given resource. + * + * @param resource + * the resource at which the module descriptor is located + * @param rev + * the revision at which the module descriptor should be + * @return the parsed module descriptor as a {@link MDResolvedResource}, or null + * if parsing has failed or if the resource is not available. + */ MDResolvedResource parse(Resource resource, String rev); }