You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2014/04/16 23:44:53 UTC
[50/50] [abbrv] git commit: [flex-sdk] [refs/heads/release4.12.0] -
FLEX-34200 accept patch
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/release4.12.0
Commit: 6517a4ba610f821aa3e55387ed65230d5ef54982
Parents: 27ec6e6
Author: Alex Harui <ah...@apache.org>
Authored: Thu Apr 10 11:54:42 2014 -0700
Committer: Alex Harui <ah...@apache.org>
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;
}
}