From easyant-commits-return-596-apmail-incubator-easyant-commits-archive=incubator.apache.org@incubator.apache.org Sun Oct 7 10:39:33 2012 Return-Path: X-Original-To: apmail-incubator-easyant-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-easyant-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 912D1D20A for ; Sun, 7 Oct 2012 10:39:33 +0000 (UTC) Received: (qmail 58589 invoked by uid 500); 7 Oct 2012 10:39:33 -0000 Delivered-To: apmail-incubator-easyant-commits-archive@incubator.apache.org Received: (qmail 58519 invoked by uid 500); 7 Oct 2012 10:39:31 -0000 Mailing-List: contact easyant-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: easyant-dev@incubator.apache.org Delivered-To: mailing list easyant-commits@incubator.apache.org Received: (qmail 58486 invoked by uid 99); 7 Oct 2012 10:39:30 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 07 Oct 2012 10:39:30 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 07 Oct 2012 10:39:27 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id B15F6238896F; Sun, 7 Oct 2012 10:38:43 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1395270 - /incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/AbstractImport.java Date: Sun, 07 Oct 2012 10:38:43 -0000 To: easyant-commits@incubator.apache.org From: jlboudart@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121007103843.B15F6238896F@eris.apache.org> Author: jlboudart Date: Sun Oct 7 10:38:43 2012 New Revision: 1395270 URL: http://svn.apache.org/viewvc?rev=1395270&view=rev Log: Fix NPE when importing a plugin with missing artifacts Modified: incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/AbstractImport.java Modified: incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/AbstractImport.java URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/AbstractImport.java?rev=1395270&r1=1395269&r2=1395270&view=diff ============================================================================== --- incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/AbstractImport.java (original) +++ incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/AbstractImport.java Sun Oct 7 10:38:43 2012 @@ -117,23 +117,28 @@ public abstract class AbstractImport ext */ protected void handleOtherResourceFile(ModuleRevisionId moduleRevisionId, String artifactName, String artifactExtension, File localResourceFile) { - StringBuilder sb = new StringBuilder(); - sb.append(moduleRevisionId.getOrganisation()); - sb.append("#"); - sb.append(moduleRevisionId.getName()); - sb.append("."); - if (!moduleRevisionId.getName().equals(artifactName)) { - sb.append(artifactName); + if (localResourceFile == null) { + getProject().log( + "Can't find artifact " + artifactName + " ext" + artifactExtension + + ". See resolution report to have details"); + } else { + StringBuilder sb = new StringBuilder(); + sb.append(moduleRevisionId.getOrganisation()); + sb.append("#"); + sb.append(moduleRevisionId.getName()); sb.append("."); - } - sb.append(artifactExtension); - sb.append(".file"); - - getProject().log( - "registering location of artifact " + artifactName + " ext" + artifactExtension + " on " - + sb.toString(), Project.MSG_DEBUG); + if (!moduleRevisionId.getName().equals(artifactName)) { + sb.append(artifactName); + sb.append("."); + } + sb.append(artifactExtension); + sb.append(".file"); - getProject().setNewProperty(sb.toString(), localResourceFile.getAbsolutePath()); + getProject().log( + "registering location of artifact " + artifactName + " ext" + artifactExtension + " on " + + sb.toString(), Project.MSG_DEBUG); + getProject().setNewProperty(sb.toString(), localResourceFile.getAbsolutePath()); + } } /**