mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 3.10.0

Browse Source 
Former-commit-id: 172c8e3c300b39d5785c7a3e8dfb08ebdbc1a99b
This commit is contained in:
Jo Shields
2014-10-04 11:27:48 +01:00
parent fe777c5c82
commit 8b9b85e7f5
970 changed files with 20242 additions and 31308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mcs/class/System.Web.Extensions/System.Web.Handlers/ScriptResourceHandler.cs
View File

@ -211,18 +211,12 @@ namespace System.Web.Handlers
rset = new ResourceManager (scriptResourceName, assembly).GetResourceSet (Threading.Thread.CurrentThread.CurrentUICulture, true, true);
}
catch (MissingManifestResourceException) {
#if TARGET_JVM // GetResourceSet does not throw MissingManifestResourceException if ressource is not exists
}
if (rset == null) {
#endif
if (scriptResourceName.EndsWith (".resources", RuntimeHelpers.StringComparison)) {
scriptResourceName = scriptResourceName.Substring (0, scriptResourceName.Length - 10);
rset = new ResourceManager (scriptResourceName, assembly).GetResourceSet (Threading.Thread.CurrentThread.CurrentUICulture, true, true);
}
#if !TARGET_JVM
else
throw;
#endif
}
if (rset == null)
break;