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 67C3210A89 for ; Tue, 14 Jan 2014 19:10:58 +0000 (UTC) Received: (qmail 18439 invoked by uid 500); 14 Jan 2014 19:10:57 -0000 Delivered-To: apmail-flex-commits-archive@flex.apache.org Received: (qmail 18327 invoked by uid 500); 14 Jan 2014 19:10:57 -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 18316 invoked by uid 99); 14 Jan 2014 19:10:56 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 14 Jan 2014 19:10:56 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id AB0D58BE647; Tue, 14 Jan 2014 19:10:56 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aharui@apache.org To: commits@flex.apache.org Date: Tue, 14 Jan 2014 19:10:57 -0000 Message-Id: <9c47a516a0b94417a00a96e9783edfa8@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: [flex-sdk] [refs/heads/develop] - attempt to fix build attempt to fix build Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/6fb5740d Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/6fb5740d Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/6fb5740d Branch: refs/heads/develop Commit: 6fb5740d147159e430145bcfd681fec612530aa0 Parents: 28b71d3 Author: Alex Harui Authored: Tue Jan 14 11:10:11 2014 -0800 Committer: Alex Harui Committed: Tue Jan 14 11:10:11 2014 -0800 ---------------------------------------------------------------------- .../projects/framework/src/mx/resources/ResourceManagerImpl.as | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/6fb5740d/frameworks/projects/framework/src/mx/resources/ResourceManagerImpl.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/framework/src/mx/resources/ResourceManagerImpl.as b/frameworks/projects/framework/src/mx/resources/ResourceManagerImpl.as index 40ac1c0..aa45ac8 100644 --- a/frameworks/projects/framework/src/mx/resources/ResourceManagerImpl.as +++ b/frameworks/projects/framework/src/mx/resources/ResourceManagerImpl.as @@ -865,10 +865,10 @@ public class ResourceManagerImpl extends EventDispatcher implements IResourceMan { if (bundleObject[obj] == localeBundleNameString) { - if (bundleObject is ResourceBundleProxy) - bundle = loadResourceBundleProxy(ResourceBundleProxy(bundleObject)); + if (obj is ResourceBundleProxy) + bundle = loadResourceBundleProxy(ResourceBundleProxy(obj)); else - bundle = bundleObject as IResourceBundle; + bundle = obj as IResourceBundle; break; } }