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 69EA911A46 for ; Thu, 10 Apr 2014 18:55:18 +0000 (UTC) Received: (qmail 17148 invoked by uid 500); 10 Apr 2014 18:55:18 -0000 Delivered-To: apmail-flex-commits-archive@flex.apache.org Received: (qmail 16931 invoked by uid 500); 10 Apr 2014 18:55:16 -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 16907 invoked by uid 99); 10 Apr 2014 18:55:15 -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, 10 Apr 2014 18:55:15 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 3EA6F989798; Thu, 10 Apr 2014 18:55:15 +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 Message-Id: <33f2c0f55d7e45bdb395ac315b343ad4@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: [flex-sdk] [refs/heads/develop] - FLEX-34200 accept patch Date: Thu, 10 Apr 2014 18:55:15 +0000 (UTC) Repository: flex-sdk Updated Branches: refs/heads/develop 27ec6e63c -> 6517a4ba6 FLEX-34200 accept patch Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/6517a4ba Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/6517a4ba Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/6517a4ba Branch: refs/heads/develop Commit: 6517a4ba610f821aa3e55387ed65230d5ef54982 Parents: 27ec6e6 Author: Alex Harui Authored: Thu Apr 10 11:54:42 2014 -0700 Committer: Alex Harui Committed: Thu Apr 10 11:55:09 2014 -0700 ---------------------------------------------------------------------- .../projects/framework/src/mx/resources/ResourceManagerImpl.as | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/6517a4ba/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 aa45ac8..b4bf97b 100644 --- a/frameworks/projects/framework/src/mx/resources/ResourceManagerImpl.as +++ b/frameworks/projects/framework/src/mx/resources/ResourceManagerImpl.as @@ -706,7 +706,10 @@ public class ResourceManagerImpl extends EventDispatcher implements IResourceMan { if (bundleObject[obj] == localeBundleNameString) { - bundle = obj as IResourceBundle; + if (obj is ResourceBundleProxy) + bundle = loadResourceBundleProxy(ResourceBundleProxy(obj)); + else + bundle = obj as IResourceBundle; break; } }