Merge commit 'd90867218312b97113ce7c50c5232f6e5ceee9be'
diff --git a/frameworks/projects/framework/src/mx/resources/ResourceManagerImpl.as b/frameworks/projects/framework/src/mx/resources/ResourceManagerImpl.as index 92915a0..a92a77c 100644 --- a/frameworks/projects/framework/src/mx/resources/ResourceManagerImpl.as +++ b/frameworks/projects/framework/src/mx/resources/ResourceManagerImpl.as
@@ -930,9 +930,6 @@ var resourceBundle:IResourceBundle = findBundle(bundleName, resourceName, locale); if (!resourceBundle) return null; - - if(!(resourceName in resourceBundle.content)) - return null; var value:String = String(resourceBundle.content[resourceName]);
diff --git a/mustella/tests/resources/ResourceManager/Methods/ResourceManager_Methods_getString.mxml b/mustella/tests/resources/ResourceManager/Methods/ResourceManager_Methods_getString.mxml index 43b74dd..ce97954 100644 --- a/mustella/tests/resources/ResourceManager/Methods/ResourceManager_Methods_getString.mxml +++ b/mustella/tests/resources/ResourceManager/Methods/ResourceManager_Methods_getString.mxml
@@ -65,19 +65,6 @@ <Pause timeout="1"/> </body> </TestCase> - - <TestCase frequency="all" testID="ResourceManager_getString_NO_SUCH_KEY_withLocale_FLEX25045" description="Tests that the getString() method of ResourceManager returns null when accessing a non-existent resource but a valid locale reference" keywords="[resources,ResourceManager,getString]"> - <setup> - <RunCode code="application.setup()"/> - <RunCode code="application.doAddResourceBundle('fr_FR', 'bundle1')" /> - - <RunCode code="ResourceManager.getInstance().localeChain = ['fr_FR']" /> - </setup> - <body> - <AssertMethodValue method="value=testGetString('NO_SUCH_KEY', null, null, 'fr_FR')" value="true"/> - <Pause timeout="1"/> - </body> - </TestCase> <TestCase frequency="all" testID="ResourceManager_getString_STRING" description="Tests the getString() method of ResourceManager for a resource value which is a typical String" keywords="[resources,ResourceManager,getString]"> <setup>