Return-Path: X-Original-To: apmail-incubator-ace-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-ace-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 8AE1F770F for ; Fri, 2 Sep 2011 13:05:58 +0000 (UTC) Received: (qmail 30850 invoked by uid 500); 2 Sep 2011 13:05:58 -0000 Delivered-To: apmail-incubator-ace-commits-archive@incubator.apache.org Received: (qmail 30825 invoked by uid 500); 2 Sep 2011 13:05:57 -0000 Mailing-List: contact ace-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ace-dev@incubator.apache.org Delivered-To: mailing list ace-commits@incubator.apache.org Received: (qmail 30817 invoked by uid 99); 2 Sep 2011 13:05:56 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Sep 2011 13:05:56 +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; Fri, 02 Sep 2011 13:05:53 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id C74F8238897D; Fri, 2 Sep 2011 13:05:32 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1164518 - /incubator/ace/trunk/ace-deployment-provider-base/src/main/java/org/apache/ace/deployment/provider/impl/ArtifactDataImpl.java Date: Fri, 02 Sep 2011 13:05:32 -0000 To: ace-commits@incubator.apache.org From: marrs@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110902130532.C74F8238897D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: marrs Date: Fri Sep 2 13:05:32 2011 New Revision: 1164518 URL: http://svn.apache.org/viewvc?rev=1164518&view=rev Log: ACE-178 Added a null check because of a test case failure. Modified: incubator/ace/trunk/ace-deployment-provider-base/src/main/java/org/apache/ace/deployment/provider/impl/ArtifactDataImpl.java Modified: incubator/ace/trunk/ace-deployment-provider-base/src/main/java/org/apache/ace/deployment/provider/impl/ArtifactDataImpl.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-deployment-provider-base/src/main/java/org/apache/ace/deployment/provider/impl/ArtifactDataImpl.java?rev=1164518&r1=1164517&r2=1164518&view=diff ============================================================================== --- incubator/ace/trunk/ace-deployment-provider-base/src/main/java/org/apache/ace/deployment/provider/impl/ArtifactDataImpl.java (original) +++ incubator/ace/trunk/ace-deployment-provider-base/src/main/java/org/apache/ace/deployment/provider/impl/ArtifactDataImpl.java Fri Sep 2 13:05:32 2011 @@ -187,9 +187,11 @@ public class ArtifactDataImpl implements } } - String path = m_directives.get(DeploymentArtifact.REPOSITORY_PATH); - if (path != null) { - a.putValue(DeploymentArtifact.REPOSITORY_PATH, path); + if (m_directives != null) { + String path = m_directives.get(DeploymentArtifact.REPOSITORY_PATH); + if (path != null) { + a.putValue(DeploymentArtifact.REPOSITORY_PATH, path); + } } if (!hasChanged() && fixPackage) { a.putValue("DeploymentPackage-Missing", "true");