Return-Path: X-Original-To: apmail-flex-commits-archive@www.apache.org Delivered-To: apmail-flex-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 56C5AC1F8 for ; Fri, 13 Sep 2013 05:47:18 +0000 (UTC) Received: (qmail 47591 invoked by uid 500); 12 Sep 2013 23:57:32 -0000 Delivered-To: apmail-flex-commits-archive@flex.apache.org Received: (qmail 47384 invoked by uid 500); 12 Sep 2013 23:57:14 -0000 Mailing-List: contact commits-help@flex.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@flex.apache.org Delivered-To: mailing list commits@flex.apache.org Received: (qmail 47197 invoked by uid 99); 12 Sep 2013 23:57:09 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 Sep 2013 23:57:09 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 8364716B8B; Thu, 12 Sep 2013 23:57:09 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jmclean@apache.org To: commits@flex.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: [flex-sdk] [refs/heads/develop] - FLEX-33683 fix adding two lists together Date: Thu, 12 Sep 2013 23:57:09 +0000 (UTC) Updated Branches: refs/heads/develop 27885880b -> 4a90e9574 FLEX-33683 fix adding two lists together Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/4a90e957 Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/4a90e957 Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/4a90e957 Branch: refs/heads/develop Commit: 4a90e9574c63b2ef25870793900a0a225cd59950 Parents: 2788588 Author: Justin Mclean Authored: Fri Sep 13 09:56:39 2013 +1000 Committer: Justin Mclean Committed: Fri Sep 13 09:56:39 2013 +1000 ---------------------------------------------------------------------- .../projects/framework/src/mx/collections/ListCollectionView.as | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4a90e957/frameworks/projects/framework/src/mx/collections/ListCollectionView.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/framework/src/mx/collections/ListCollectionView.as b/frameworks/projects/framework/src/mx/collections/ListCollectionView.as index 95acb60..8f4ff02 100644 --- a/frameworks/projects/framework/src/mx/collections/ListCollectionView.as +++ b/frameworks/projects/framework/src/mx/collections/ListCollectionView.as @@ -653,7 +653,9 @@ public class ListCollectionView extends Proxy */ public function addAllAt(addList:IList, index:int):void { - if (index < 0 || index > this.length) + var maxLength:int = this.length + + if (index < 0 || index > maxLength) { var message:String = resourceManager.getString( "collections", "outOfBounds", [ index ]); @@ -661,7 +663,6 @@ public class ListCollectionView extends Proxy } var length:int = addList.length; - var maxLength:int = length // incremental index may be out of bounds because of filtering, // so add this item to the end.