Return-Path: Delivered-To: apmail-maven-continuum-commits-archive@www.apache.org Received: (qmail 25776 invoked from network); 19 Sep 2006 05:58:51 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 19 Sep 2006 05:58:51 -0000 Received: (qmail 50239 invoked by uid 500); 19 Sep 2006 05:58:51 -0000 Delivered-To: apmail-maven-continuum-commits-archive@maven.apache.org Received: (qmail 50206 invoked by uid 500); 19 Sep 2006 05:58:51 -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 50193 invoked by uid 99); 19 Sep 2006 05:58:51 -0000 Received: from idunn.apache.osuosl.org (HELO idunn.apache.osuosl.org) (140.211.166.84) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 18 Sep 2006 22:58:51 -0700 X-ASF-Spam-Status: No, hits=-9.8 required=5.0 tests=ALL_TRUSTED,NO_REAL_NAME Received: from ([140.211.166.113:64273] helo=eris.apache.org) by idunn.apache.osuosl.org (ecelerity 2.1 r(10620)) with ESMTP id F0/F2-26148-C078F054 for ; Mon, 18 Sep 2006 22:58:36 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 1867E1A981D; Mon, 18 Sep 2006 22:58:34 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r447753 - /maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java Date: Tue, 19 Sep 2006 05:58:33 -0000 To: continuum-commits@maven.apache.org From: carlos@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20060919055834.1867E1A981D@eris.apache.org> X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: carlos Date: Mon Sep 18 22:58:33 2006 New Revision: 447753 URL: http://svn.apache.org/viewvc?view=rev&rev=447753 Log: Fix NPE Modified: maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java Modified: maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java?view=diff&rev=447753&r1=447752&r2=447753 ============================================================================== --- maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java (original) +++ maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java Mon Sep 18 22:58:33 2006 @@ -36,6 +36,7 @@ import org.apache.maven.continuum.model.project.ProjectGroup; import org.apache.maven.continuum.model.project.ProjectNotifier; import org.apache.maven.continuum.model.project.Schedule; +import org.apache.maven.continuum.model.scm.ScmResult; import org.apache.maven.continuum.model.system.ContinuumUser; import org.apache.maven.continuum.model.system.UserGroup; import org.apache.maven.continuum.project.ContinuumProjectState; @@ -813,7 +814,12 @@ changes = new ArrayList(); } - changes.addAll( buildResult.getScmResult().getChanges() ); + ScmResult scmResult = buildResult.getScmResult(); + + if ( scmResult != null ) + { + changes.addAll( scmResult.getChanges() ); + } if ( !buildResultsIterator.hasNext() ) {