Return-Path: Delivered-To: apmail-maven-continuum-commits-archive@www.apache.org Received: (qmail 56417 invoked from network); 21 Dec 2005 15:09:56 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 21 Dec 2005 15:09:56 -0000 Received: (qmail 67898 invoked by uid 500); 21 Dec 2005 15:09:56 -0000 Delivered-To: apmail-maven-continuum-commits-archive@maven.apache.org Received: (qmail 67873 invoked by uid 500); 21 Dec 2005 15:09:55 -0000 Mailing-List: contact continuum-commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: continuum-dev@maven.apache.org Delivered-To: mailing list continuum-commits@maven.apache.org Received: (qmail 67856 invoked by uid 99); 21 Dec 2005 15:09:54 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 21 Dec 2005 07:09:54 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Wed, 21 Dec 2005 07:09:54 -0800 Received: (qmail 56146 invoked by uid 65534); 21 Dec 2005 15:09:34 -0000 Message-ID: <20051221150934.56143.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r358304 - /maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java Date: Wed, 21 Dec 2005 15:09:33 -0000 To: continuum-commits@maven.apache.org From: evenisse@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: evenisse Date: Wed Dec 21 07:09:26 2005 New Revision: 358304 URL: http://svn.apache.org/viewcvs?rev=358304&view=rev Log: PR: CONTINUUM-519 Submitted by: Dan Tran Fix NPE in buildProjects. Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java?rev=358304&r1=358303&r2=358304&view=diff ============================================================================== --- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java (original) +++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java Wed Dec 21 07:09:26 2005 @@ -365,12 +365,12 @@ { Project p = (Project) projectIterator.next(); - int buildDefId = ( (Integer) projectsMap.get( new Integer( p.getId() ) ) ).intValue(); + Integer buildDefId = ( (Integer) projectsMap.get( new Integer( p.getId() ) ) ); - if ( !isInBuildingQueue( p.getId() ) && !isInCheckoutQueue( p.getId() ) ) + if ( buildDefId != null && !isInBuildingQueue( p.getId() ) && !isInCheckoutQueue( p.getId() ) ) { //TODO: Fix trigger name - buildProject( p.getId(), buildDefId, ContinuumProjectState.TRIGGER_UNKNOWN, false ); + buildProject( p.getId(), buildDefId.intValue(), ContinuumProjectState.TRIGGER_UNKNOWN, false ); } } }