From commits-return-4981-apmail-continuum-commits-archive=continuum.apache.org@continuum.apache.org Sun Feb 22 15:10:00 2009 Return-Path: Delivered-To: apmail-continuum-commits-archive@www.apache.org Received: (qmail 51741 invoked from network); 22 Feb 2009 15:10:00 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 22 Feb 2009 15:10:00 -0000 Received: (qmail 23931 invoked by uid 500); 22 Feb 2009 15:10:00 -0000 Delivered-To: apmail-continuum-commits-archive@continuum.apache.org Received: (qmail 23919 invoked by uid 500); 22 Feb 2009 15:10:00 -0000 Mailing-List: contact commits-help@continuum.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@continuum.apache.org Delivered-To: mailing list commits@continuum.apache.org Received: (qmail 23910 invoked by uid 99); 22 Feb 2009 15:10:00 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 22 Feb 2009 07:10:00 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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, 22 Feb 2009 15:09:58 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 028CE2388AFB; Sun, 22 Feb 2009 15:09:37 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r746724 - /continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/AbstractBuildExecutor.java Date: Sun, 22 Feb 2009 15:09:36 -0000 To: commits@continuum.apache.org From: ctan@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090222150937.028CE2388AFB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ctan Date: Sun Feb 22 15:09:36 2009 New Revision: 746724 URL: http://svn.apache.org/viewvc?rev=746724&view=rev Log: fixed exception when updating project from working copy with a null project dependency version in distributed build Modified: continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/AbstractBuildExecutor.java Modified: continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/AbstractBuildExecutor.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/AbstractBuildExecutor.java?rev=746724&r1=746723&r2=746724&view=diff ============================================================================== --- continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/AbstractBuildExecutor.java (original) +++ continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/AbstractBuildExecutor.java Sun Feb 22 15:09:36 2009 @@ -422,7 +422,14 @@ Map map = new HashMap(); map.put( ContinuumBuildAgentUtil.KEY_GROUP_ID, dependency.getGroupId() ); map.put( ContinuumBuildAgentUtil.KEY_ARTIFACT_ID, dependency.getArtifactId() ); - map.put( ContinuumBuildAgentUtil.KEY_PROJECT_VERSION, dependency.getVersion() ); + if ( StringUtils.isNotBlank( dependency.getVersion() ) ) + { + map.put( ContinuumBuildAgentUtil.KEY_PROJECT_VERSION, dependency.getVersion() ); + } + else + { + map.put( ContinuumBuildAgentUtil.KEY_PROJECT_VERSION, "" ); + } pDependencies.add( map ); }