Updated Branches: refs/heads/develop a52917f4c -> 56d67ccf3
FLEX-33902 reduce memory allocations Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/ae081d08 Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/ae081d08 Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/ae081d08 Branch: refs/heads/develop Commit: ae081d088e2bb7e982e4ac7040c0fa064d610144 Parents: a52917f Author: Justin Mclean <jmcl...@apache.org> Authored: Fri Dec 27 11:19:33 2013 +1100 Committer: Justin Mclean <jmcl...@apache.org> Committed: Fri Dec 27 11:19:33 2013 +1100 ---------------------------------------------------------------------- .../projects/framework/src/mx/resources/ResourceManager.as | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/ae081d08/frameworks/projects/framework/src/mx/resources/ResourceManager.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/framework/src/mx/resources/ResourceManager.as b/frameworks/projects/framework/src/mx/resources/ResourceManager.as index cfe78bb..fca9deb 100644 --- a/frameworks/projects/framework/src/mx/resources/ResourceManager.as +++ b/frameworks/projects/framework/src/mx/resources/ResourceManager.as @@ -120,10 +120,12 @@ public class ResourceManager // won't have been initialized by SystemManager // or FlexModuleFactory (since these don't get linked in) // so the above call to getInstance() will throw an exception. - // In this situation, the ResourceManager simply creates - // its own ResourceManagerImpl. - instance = new ResourceManagerImpl(); } + + // In this situation, the ResourceManager simply creates + // its own ResourceManagerImpl. + if (!instance) + instance = new ResourceManagerImpl(); CONFIG::performanceInstrumentation {
