Return-Path: Delivered-To: apmail-incubator-aries-commits-archive@minotaur.apache.org Received: (qmail 71246 invoked from network); 14 Dec 2010 13:48:50 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 14 Dec 2010 13:48:50 -0000 Received: (qmail 59978 invoked by uid 500); 14 Dec 2010 13:48:50 -0000 Delivered-To: apmail-incubator-aries-commits-archive@incubator.apache.org Received: (qmail 59887 invoked by uid 500); 14 Dec 2010 13:48:49 -0000 Mailing-List: contact aries-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: aries-dev@incubator.apache.org Delivered-To: mailing list aries-commits@incubator.apache.org Received: (qmail 59879 invoked by uid 99); 14 Dec 2010 13:48:49 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 14 Dec 2010 13:48:49 +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; Tue, 14 Dec 2010 13:48:46 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id C02002388A32; Tue, 14 Dec 2010 13:48:25 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1049086 - /incubator/aries/trunk/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/BlueprintURLContext.java Date: Tue, 14 Dec 2010 13:48:25 -0000 To: aries-commits@incubator.apache.org From: mnuttall@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101214134825.C02002388A32@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mnuttall Date: Tue Dec 14 13:48:25 2010 New Revision: 1049086 URL: http://svn.apache.org/viewvc?rev=1049086&view=rev Log: ARIES-512: Add web itest Modified: incubator/aries/trunk/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/BlueprintURLContext.java Modified: incubator/aries/trunk/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/BlueprintURLContext.java URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/BlueprintURLContext.java?rev=1049086&r1=1049085&r2=1049086&view=diff ============================================================================== --- incubator/aries/trunk/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/BlueprintURLContext.java (original) +++ incubator/aries/trunk/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/BlueprintURLContext.java Tue Dec 14 13:48:25 2010 @@ -382,15 +382,17 @@ public class BlueprintURLContext impleme { ServiceReference[] refs = b.getRegisteredServices(); ServiceReference result = null; - outer: for (ServiceReference r : refs) { - String[] objectClasses = (String[]) r.getProperty(Constants.OBJECTCLASS); - for (String objectClass : objectClasses) { - if (objectClass.equals(BlueprintContainer.class.getName())) { - // Arguably we could put an r.isAssignableTo(jndi-url-bundle, BlueprintContainer.class.getName()) - // check here. But if you've got multiple, class-space inconsistent instances of blueprint in - // your environment, you've almost certainly got other problems. - result = r; - break outer; + if (refs != null) { + outer: for (ServiceReference r : refs) { + String[] objectClasses = (String[]) r.getProperty(Constants.OBJECTCLASS); + for (String objectClass : objectClasses) { + if (objectClass.equals(BlueprintContainer.class.getName())) { + // Arguably we could put an r.isAssignableTo(jndi-url-bundle, BlueprintContainer.class.getName()) + // check here. But if you've got multiple, class-space inconsistent instances of blueprint in + // your environment, you've almost certainly got other problems. + result = r; + break outer; + } } } }