Return-Path: X-Original-To: apmail-aries-commits-archive@www.apache.org Delivered-To: apmail-aries-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4E5E41864C for ; Tue, 12 Jan 2016 16:53:16 +0000 (UTC) Received: (qmail 45856 invoked by uid 500); 12 Jan 2016 16:53:16 -0000 Delivered-To: apmail-aries-commits-archive@aries.apache.org Received: (qmail 45789 invoked by uid 500); 12 Jan 2016 16:53:16 -0000 Mailing-List: contact commits-help@aries.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@aries.apache.org Delivered-To: mailing list commits@aries.apache.org Received: (qmail 45776 invoked by uid 99); 12 Jan 2016 16:53:16 -0000 Received: from Unknown (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 Jan 2016 16:53:16 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id C35F4180510 for ; Tue, 12 Jan 2016 16:53:15 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.446 X-Spam-Level: X-Spam-Status: No, score=0.446 tagged_above=-999 required=6.31 tests=[KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-0.554] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id cuGb2MDPaOKp for ; Tue, 12 Jan 2016 16:53:15 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with ESMTP id 182B8439C4 for ; Tue, 12 Jan 2016 16:53:15 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id 93332E0361 for ; Tue, 12 Jan 2016 16:53:14 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 8DFBB3A229D for ; Tue, 12 Jan 2016 16:53:14 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1724284 - /aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/DependencyCalculator.java Date: Tue, 12 Jan 2016 16:53:14 -0000 To: commits@aries.apache.org From: jwross@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20160112165314.8DFBB3A229D@svn01-us-west.apache.org> Author: jwross Date: Tue Jan 12 16:53:14 2016 New Revision: 1724284 URL: http://svn.apache.org/viewvc?rev=1724284&view=rev Log: [ARIES-1485] java.lang.UnsupportedOperationException when a hosted capability is being inserted by the resolver. Modified: aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/DependencyCalculator.java Modified: aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/DependencyCalculator.java URL: http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/DependencyCalculator.java?rev=1724284&r1=1724283&r2=1724284&view=diff ============================================================================== --- aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/DependencyCalculator.java (original) +++ aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/DependencyCalculator.java Tue Jan 12 16:53:14 2016 @@ -83,8 +83,9 @@ public class DependencyCalculator { @Override public int insertHostedCapability(List capabilities, HostedCapability hostedCapability) { - capabilities.add(hostedCapability); - return capabilities.size() - 1; + int sz = capabilities.size(); + capabilities.add(sz, hostedCapability); + return sz; } }