Return-Path: Delivered-To: apmail-incubator-aries-commits-archive@minotaur.apache.org Received: (qmail 22327 invoked from network); 26 Nov 2010 12:12:49 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 26 Nov 2010 12:12:49 -0000 Received: (qmail 64267 invoked by uid 500); 26 Nov 2010 12:12:48 -0000 Delivered-To: apmail-incubator-aries-commits-archive@incubator.apache.org Received: (qmail 64183 invoked by uid 500); 26 Nov 2010 12:12:47 -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 64175 invoked by uid 99); 26 Nov 2010 12:12:46 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 26 Nov 2010 12:12:46 +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; Fri, 26 Nov 2010 12:12:44 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 3903723889D7; Fri, 26 Nov 2010 12:11:12 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1039324 - /incubator/aries/trunk/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/ServiceRegistryListContext.java Date: Fri, 26 Nov 2010 12:11:12 -0000 To: aries-commits@incubator.apache.org From: not@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101126121112.3903723889D7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: not Date: Fri Nov 26 12:11:11 2010 New Revision: 1039324 URL: http://svn.apache.org/viewvc?rev=1039324&view=rev Log: ARIES-501 Make sure we never have a null array of ServiceReferences in our ServiceNamingEnumeration Modified: incubator/aries/trunk/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/ServiceRegistryListContext.java Modified: incubator/aries/trunk/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/ServiceRegistryListContext.java URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/ServiceRegistryListContext.java?rev=1039324&r1=1039323&r2=1039324&view=diff ============================================================================== --- incubator/aries/trunk/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/ServiceRegistryListContext.java (original) +++ incubator/aries/trunk/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/ServiceRegistryListContext.java Fri Nov 26 12:11:11 2010 @@ -56,7 +56,7 @@ public class ServiceRegistryListContext private ServiceNamingEnumeration(BundleContext context, ServiceReference[] theRefs, ThingManager manager) { ctx = context; - refs = theRefs; + refs = (theRefs != null) ? theRefs : new ServiceReference[0]; mgr = manager; }