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 2013/12/27 01:21:44 UTC

[1/2] git commit: [flex-sdk] [refs/heads/develop] - FLEX-33902 reduce memory allocations

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 <jm...@apache.org>
Authored: Fri Dec 27 11:19:33 2013 +1100
Committer: Justin Mclean <jm...@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
             {


Re: [2/2] git commit: [flex-sdk] [refs/heads/develop] - Remove compiler warning

Posted by Justin Mclean <ju...@classsoftware.com>.
Hi,

> Remove compiler warning

Forgot  to add that binding tests pass.

Justin

[2/2] git commit: [flex-sdk] [refs/heads/develop] - Remove compiler warning

Posted by jm...@apache.org.
Remove compiler warning


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

Branch: refs/heads/develop
Commit: 56d67ccf3e4436437875cf3562ce508142804e36
Parents: ae081d0
Author: Justin Mclean <jm...@apache.org>
Authored: Fri Dec 27 11:20:55 2013 +1100
Committer: Justin Mclean <jm...@apache.org>
Committed: Fri Dec 27 11:20:55 2013 +1100

----------------------------------------------------------------------
 frameworks/projects/framework/src/mx/binding/Binding.as | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/56d67ccf/frameworks/projects/framework/src/mx/binding/Binding.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/framework/src/mx/binding/Binding.as b/frameworks/projects/framework/src/mx/binding/Binding.as
index a03ba16..b2e0598 100644
--- a/frameworks/projects/framework/src/mx/binding/Binding.as
+++ b/frameworks/projects/framework/src/mx/binding/Binding.as
@@ -292,7 +292,7 @@ public class Binding
         {
             element = element[chain[i++]];
             //if the element does not exist : avoid exception as it's heavy on memory allocations
-            if(element == null || element == undefined) {
+            if (element == null) {
                 destFuncFailed = true;
                 if (BindingManager.debugDestinationStrings[destString])
                 {