[3/6] git commit: [flex-sdk] [refs/heads/release4.14.0] - FLEX-25045 getString now returns null as expected if supplied a valid locale but not a valid resourceName

[bi...@apache.org]

FLEX-25045 getString now returns null as expected if supplied a valid locale but not a valid resourceName


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

Branch: refs/heads/release4.14.0
Commit: a3f73798d4c81a761d81f0ad154d1958b8aa1254
Parents: 3213c1b
Author: chrsmrtn <ch...@apache.org>
Authored: Fri Dec 12 14:22:50 2014 -0700
Committer: chrsmrtn <ch...@apache.org>
Committed: Fri Dec 12 14:29:35 2014 -0700

----------------------------------------------------------------------
 .../projects/framework/src/mx/resources/ResourceManagerImpl.as    | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/a3f73798/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 3e9c6fa..b5816a0 100644
--- a/frameworks/projects/framework/src/mx/resources/ResourceManagerImpl.as
+++ b/frameworks/projects/framework/src/mx/resources/ResourceManagerImpl.as
@@ -940,6 +940,9 @@ public class ResourceManagerImpl extends EventDispatcher implements IResourceMan
             findBundle(bundleName, resourceName, locale);
         if (!resourceBundle)
             return null;
+        
+        if(!(resourceName in resourceBundle.content))
+            return null;
 
         var value:String = String(resourceBundle.content[resourceName]);