Return-Path: Delivered-To: apmail-tuscany-commits-archive@www.apache.org Received: (qmail 45412 invoked from network); 8 Aug 2010 09:30:54 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 8 Aug 2010 09:30:54 -0000 Received: (qmail 51178 invoked by uid 500); 8 Aug 2010 09:30:54 -0000 Delivered-To: apmail-tuscany-commits-archive@tuscany.apache.org Received: (qmail 51130 invoked by uid 500); 8 Aug 2010 09:30:53 -0000 Mailing-List: contact commits-help@tuscany.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tuscany.apache.org Delivered-To: mailing list commits@tuscany.apache.org Received: (qmail 51123 invoked by uid 99); 8 Aug 2010 09:30:52 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 08 Aug 2010 09:30:52 +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, 08 Aug 2010 09:30:50 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id EEB1E23889E9; Sun, 8 Aug 2010 09:29:32 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r983368 - /tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/NodeFactory.java Date: Sun, 08 Aug 2010 09:29:32 -0000 To: commits@tuscany.apache.org From: antelder@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100808092932.EEB1E23889E9@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: antelder Date: Sun Aug 8 09:29:32 2010 New Revision: 983368 URL: http://svn.apache.org/viewvc?rev=983368&view=rev Log: Avoid NPE when no dependent contributions are used Modified: tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/NodeFactory.java Modified: tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/NodeFactory.java URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/NodeFactory.java?rev=983368&r1=983367&r2=983368&view=diff ============================================================================== --- tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/NodeFactory.java (original) +++ tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/NodeFactory.java Sun Aug 8 09:29:32 2010 @@ -66,8 +66,10 @@ public class NodeFactory { EndpointRegistry endpointRegistry = new EndpointRegistryImpl(nodeFactory.extensionPointRegistry, null, null); NodeImpl node = new NodeImpl("default", nodeFactory.deployer, nodeFactory.compositeActivator, endpointRegistry, nodeFactory.extensionPointRegistry, nodeFactory); - for (int i=dependentContributionURLs.length-1; i>-1; i--) { - node.installContribution(null, dependentContributionURLs[i], null, null, false); + if (dependentContributionURLs != null) { + for (int i=dependentContributionURLs.length-1; i>-1; i--) { + node.installContribution(null, dependentContributionURLs[i], null, null, false); + } } String curi = node.installContribution(null, contributionURL, null, null, compositeURI == null);