Return-Path: Delivered-To: apmail-maven-continuum-commits-archive@www.apache.org Received: (qmail 97963 invoked from network); 13 Dec 2006 07:52:54 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 13 Dec 2006 07:52:54 -0000 Received: (qmail 36656 invoked by uid 500); 13 Dec 2006 07:53:02 -0000 Delivered-To: apmail-maven-continuum-commits-archive@maven.apache.org Received: (qmail 36637 invoked by uid 500); 13 Dec 2006 07:53:02 -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 36624 invoked by uid 99); 13 Dec 2006 07:53:02 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 Dec 2006 23:53:02 -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 [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 Dec 2006 23:52:53 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 94AD01A981A; Tue, 12 Dec 2006 23:52:08 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r486538 - /maven/continuum/trunk/continuum-store/src/main/java/org/apache/maven/continuum/store/JdoContinuumStore.java Date: Wed, 13 Dec 2006 07:52:08 -0000 To: continuum-commits@maven.apache.org From: brett@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061213075208.94AD01A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: brett Date: Tue Dec 12 23:52:07 2006 New Revision: 486538 URL: http://svn.apache.org/viewvc?view=rev&rev=486538 Log: prevent an NPE Submitted by: Franz Allen Valencia See Modified: maven/continuum/trunk/continuum-store/src/main/java/org/apache/maven/continuum/store/JdoContinuumStore.java Modified: maven/continuum/trunk/continuum-store/src/main/java/org/apache/maven/continuum/store/JdoContinuumStore.java URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-store/src/main/java/org/apache/maven/continuum/store/JdoContinuumStore.java?view=diff&rev=486538&r1=486537&r2=486538 ============================================================================== --- maven/continuum/trunk/continuum-store/src/main/java/org/apache/maven/continuum/store/JdoContinuumStore.java (original) +++ maven/continuum/trunk/continuum-store/src/main/java/org/apache/maven/continuum/store/JdoContinuumStore.java Tue Dec 12 23:52:07 2006 @@ -223,20 +223,24 @@ // iterate through the project groups and make sure we are not walking over projects that // might define their own build definitions - for ( Iterator i = projectGroupSource.keySet().iterator(); i.hasNext(); ) + if ( projectGroupSource != null ) { - Integer projectGroupId = (Integer) i.next(); - List projectsInGroup = getProjectsInGroup( projectGroupId.intValue() ); - - for ( Iterator j = projectsInGroup.iterator(); j.hasNext(); ) + for ( Iterator i = projectGroupSource.keySet().iterator(); i.hasNext(); ) { - Integer projectId = new Integer( ( (Project) j.next() ).getId() ); - if ( !aggregate.keySet().contains( projectId ) ) + Integer projectGroupId = (Integer) i.next(); + List projectsInGroup = getProjectsInGroup( projectGroupId.intValue() ); + + for ( Iterator j = projectsInGroup.iterator(); j.hasNext(); ) { - aggregate.put( projectId, projectGroupSource.get( projectGroupId ) ); + Integer projectId = new Integer( ( (Project) j.next() ).getId() ); + if ( !aggregate.keySet().contains( projectId ) ) + { + aggregate.put( projectId, projectGroupSource.get( projectGroupId ) ); + } } } } + return aggregate; }