You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by jm...@apache.org on 2014/01/12 09:49:42 UTC

git commit: [flex-sdk] [refs/heads/develop] - fix for RTE in mustella tests

Updated Branches:
  refs/heads/develop 2187226c7 -> b26e5332e


fix for RTE in mustella tests


Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/b26e5332
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/b26e5332
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/b26e5332

Branch: refs/heads/develop
Commit: b26e5332e3fb078ed53afa97bc6aa76d7fc12757
Parents: 2187226
Author: Justin Mclean <jm...@apache.org>
Authored: Sun Jan 12 19:49:16 2014 +1100
Committer: Justin Mclean <jm...@apache.org>
Committed: Sun Jan 12 19:49:16 2014 +1100

----------------------------------------------------------------------
 .../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/b26e5332/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 07c6d95..40ac1c0 100644
--- a/frameworks/projects/framework/src/mx/resources/ResourceManagerImpl.as
+++ b/frameworks/projects/framework/src/mx/resources/ResourceManagerImpl.as
@@ -865,7 +865,10 @@ public class ResourceManagerImpl extends EventDispatcher implements IResourceMan
                 {
                     if (bundleObject[obj] == localeBundleNameString)
                     {
-                        bundle = obj as IResourceBundle;
+						if (bundleObject is ResourceBundleProxy)
+							bundle = loadResourceBundleProxy(ResourceBundleProxy(bundleObject));
+						else 
+							bundle = bundleObject as IResourceBundle;
                         break;
                     }
                 }