Return-Path: Delivered-To: apmail-felix-commits-archive@www.apache.org Received: (qmail 26001 invoked from network); 2 Aug 2009 10:57:20 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 2 Aug 2009 10:57:20 -0000 Received: (qmail 43101 invoked by uid 500); 2 Aug 2009 10:57:23 -0000 Delivered-To: apmail-felix-commits-archive@felix.apache.org Received: (qmail 43036 invoked by uid 500); 2 Aug 2009 10:57:23 -0000 Mailing-List: contact commits-help@felix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@felix.apache.org Delivered-To: mailing list commits@felix.apache.org Received: (qmail 43027 invoked by uid 99); 2 Aug 2009 10:57:23 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 02 Aug 2009 10:57:23 +0000 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, 02 Aug 2009 10:57:21 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id CD7E623888BB; Sun, 2 Aug 2009 10:57:01 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r800024 - /felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/repository/RepositoryConfiguration.java Date: Sun, 02 Aug 2009 10:57:01 -0000 To: commits@felix.apache.org From: dsavage@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090802105701.CD7E623888BB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dsavage Date: Sun Aug 2 10:57:01 2009 New Revision: 800024 URL: http://svn.apache.org/viewvc?rev=800024&view=rev Log: Prevent NPE, throw meaningful runtime exception in it's place, FELIX-1438 Modified: felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/repository/RepositoryConfiguration.java Modified: felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/repository/RepositoryConfiguration.java URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/repository/RepositoryConfiguration.java?rev=800024&r1=800023&r2=800024&view=diff ============================================================================== --- felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/repository/RepositoryConfiguration.java (original) +++ felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/repository/RepositoryConfiguration.java Sun Aug 2 10:57:01 2009 @@ -169,8 +169,12 @@ //int level = findLevel( key + LEVEL, type, prefs ); ArrayList reps = new ArrayList(); for ( String s : PrefsUtils.stringToArray( getPreferences().getString( REPOSITORY_DEFAULT_SET ) ) ) - { - reps.add( findRepository( s ) ); + { + IRepositoryModel rep = findRepository( s ); + if ( rep == null ) { + throw new IllegalStateException( "Missing repository for " + s ); + } + reps.add( rep ); } return new RepositorySet( reps ); } @@ -184,7 +188,11 @@ ArrayList reps = new ArrayList(); for ( String s : PrefsUtils.stringToArray( getPreferences().getString( key ) ) ) { - reps.add( findRepository( s ) ); + IRepositoryModel rep = findRepository( s ); + if ( rep == null ) { + throw new IllegalStateException( "Missing repository for " + s ); + } + reps.add( rep ); } return new RepositorySet( reps ); }