Skip to content

Commit 163cab4

Browse files
committed
fixed keybuilder nullreference issue raised by many. fixed appfabric utcdate issue raised by swayambhuba. fixed keygenerator querystring issue raised by ysrb.
1 parent 2cd3ea7 commit 163cab4

File tree

7 files changed

+19
-6
lines changed

7 files changed

+19
-6
lines changed

.gitignore

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#OS junk files
2+
[Tt]humbs.db
3+
4+
#Visual Studio files
5+
bin/
6+
obj/
7+
packages/
8+
*.user
9+
*.suo
10+
*.Publish.xml

DevTrends.MvcDonutCaching/DonutOutputCacheAttribute.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public override void OnActionExecuting(ActionExecutingContext filterContext)
9191

9292
if (_cacheSettings.IsServerCachingEnabled && filterContext.HttpContext.Response.StatusCode == 200)
9393
{
94-
_outputCacheManager.AddItem(cacheKey, cacheItem, DateTime.Now.AddSeconds(_cacheSettings.Duration));
94+
_outputCacheManager.AddItem(cacheKey, cacheItem, DateTime.UtcNow.AddSeconds(_cacheSettings.Duration));
9595
}
9696
}
9797
});

DevTrends.MvcDonutCaching/KeyBuilder.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,9 @@ public string BuildKey(string controllerName, string actionName, RouteValueDicti
4545

4646
public string BuildKeyFragment(KeyValuePair<string, object> routeValue)
4747
{
48-
return string.Format("{0}={1}#", routeValue.Key.ToLowerInvariant(), routeValue.Value.ToString().ToLowerInvariant());
48+
var value = routeValue.Value == null ? "<null>" : routeValue.Value.ToString().ToLowerInvariant();
49+
50+
return string.Format("{0}={1}#", routeValue.Key.ToLowerInvariant(), value);
4951
}
5052
}
5153
}

DevTrends.MvcDonutCaching/KeyGenerator.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ public string GenerateKey(ControllerContext context, CacheSettings cacheSettings
4747

4848
foreach (var queryStringKey in context.HttpContext.Request.QueryString.AllKeys)
4949
{
50-
if (!routeValues.ContainsKey(queryStringKey.ToLowerInvariant()))
50+
// queryStringKey is null if url has qs name without value. e.g. test.com?q
51+
if (queryStringKey != null && !routeValues.ContainsKey(queryStringKey.ToLowerInvariant()))
5152
{
5253
routeValues.Add(queryStringKey.ToLowerInvariant(),
5354
context.HttpContext.Request.QueryString[queryStringKey].ToLowerInvariant());

DevTrends.MvcDonutCaching/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@
1111
[assembly: AssemblyCulture("")]
1212
[assembly: ComVisible(false)]
1313
[assembly: Guid("ebcc3291-f04a-4511-b7eb-ddf57a74ada9")]
14-
[assembly: AssemblyVersion("1.2.0")]
15-
[assembly: AssemblyFileVersion("1.2.0")]
14+
[assembly: AssemblyVersion("1.2.1")]
15+
[assembly: AssemblyFileVersion("1.2.1")]

nuget/MvcDonutCaching.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
33
<metadata>
44
<id>MvcDonutCaching</id>
5-
<version>1.2.0</version>
5+
<version>1.2.1</version>
66
<authors>Paul Hiles</authors>
77
<owners>DevTrends</owners>
88
<licenseUrl>http://mvcdonutcaching.codeplex.com/license</licenseUrl>
0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)