Merge branch 'release4.14.1'
Signed-off-by: Erik de Bruin <erik@ixsoftware.nl>
Conflicts:
apache-flex-sdk-installer-config.xml
build.properties
flex-sdk-description.xml
frameworks/build.xml
frameworks/projects/advancedgrids/src/mx/core/Version.as
frameworks/projects/airframework/src/mx/core/Version.as
frameworks/projects/airspark/src/spark/core/Version.as
frameworks/projects/apache/src/core/Version.as
frameworks/projects/automation/src/mx/core/Version.as
frameworks/projects/automation_agent/src/mx/core/Version.as
frameworks/projects/automation_air/src/mx/core/Version.as
frameworks/projects/automation_dmv/src/mx/core/Version.as
frameworks/projects/automation_flashflexkit/src/mx/core/Version.as
frameworks/projects/automation_spark/src/mx/core/Version.as
frameworks/projects/automation_spark/src/spark/core/Version.as
frameworks/projects/charts/src/mx/core/Version.as
frameworks/projects/framework/src/mx/core/FlexVersion.as
frameworks/projects/framework/src/mx/core/Version.as
frameworks/projects/mx/src/mx/core/Version.as
frameworks/projects/rpc/src/mx/core/Version.as
frameworks/projects/spark/src/spark/core/Version.as
frameworks/projects/spark/src/spark/skins/spark/BusyIndicatorSkin.as
frameworks/projects/spark_dmv/src/spark/core/Version.as
frameworks/projects/tool/src/mx/core/Version.as
frameworks/projects/tool_air/src/mx/core/Version.as
ide/addAIRtoSDK.sh
ide/checkAllPlayerGlobals.sh
ide/flashbuilder/config/air-config.xml
ide/flashbuilder/config/flex-config.xml
ide/setFlashPlayerVersion.sh
jenkins.xml
modules/compiler/src/java/flex2/compiler/common/MxmlConfiguration.java
modules/compiler/src/java/flex2/tools/VersionInfo.java
diff --git a/frameworks/projects/framework/src/mx/resources/ResourceManagerImpl.as b/frameworks/projects/framework/src/mx/resources/ResourceManagerImpl.as
index b5816a0..3e9c6fa 100644
--- a/frameworks/projects/framework/src/mx/resources/ResourceManagerImpl.as
+++ b/frameworks/projects/framework/src/mx/resources/ResourceManagerImpl.as
@@ -940,9 +940,6 @@
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>
