flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject git commit: [flex-sdk] [refs/heads/develop] - FLEX-34200 accept patch
Date Thu, 10 Apr 2014 18:55:15 GMT
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 <aharui@apache.org>
Authored: Thu Apr 10 11:54:42 2014 -0700
Committer: Alex Harui <aharui@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;
                 }
             }


Mime
View raw message