X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FSystem.Web%2FSystem.Web.Handlers%2FAssemblyResourceLoader.cs;h=7f59b52e22b47f90653406803db3f8ef8acc6c08;hb=12b712c8917ac1411c3f85436845ec53d8c33a18;hp=4efb0e0b921214dac6ac4cb19bd856c64efd4f1a;hpb=3fd4901a235bda0019f03317f4ee083744195758;p=mono.git

diff --git a/mcs/class/System.Web/System.Web.Handlers/AssemblyResourceLoader.cs b/mcs/class/System.Web/System.Web.Handlers/AssemblyResourceLoader.cs
index 4efb0e0b921..7f59b52e22b 100644
--- a/mcs/class/System.Web/System.Web.Handlers/AssemblyResourceLoader.cs
+++ b/mcs/class/System.Web/System.Web.Handlers/AssemblyResourceLoader.cs
@@ -79,7 +79,9 @@ namespace System.Web.Handlers
 					if (!hashAlg.CanReuseTransform) {
 						canReuseHashAlg = false;
 						hashAlg = null;
+						return null;
 					}
+					hashAlg.Key = MachineKeySectionUtils.GetValidationKey (mks);
 				}
 
 				if (hashAlg != null)
@@ -272,9 +274,7 @@ namespace System.Web.Handlers
 				debug = resourceName.EndsWith (".debug.js", StringComparison.OrdinalIgnoreCase);
 				string dbgTail = debug ? "d" : String.Empty;
 				lookupKey = resourceNameHash + (notifyScriptLoaded ? "t" : "f") + dbgTail;
-#if NET_3_5
 				CheckIfResourceIsCompositeScript (resourceName, ref includeTimeStamp);
-#endif
 #else
 				lookupKey = resourceNameHash;
 #endif