Checking for Area name not null

moonpyk · moonpyk · commit f87ab5420a0d · 2014-10-08T19:14:17.000+02:00
diff --git a/DevTrends.MvcDonutCaching/KeyGenerator.cs b/DevTrends.MvcDonutCaching/KeyGenerator.cs
@@ -60,7 +60,10 @@ public string GenerateKey(ControllerContext context, CacheSettings cacheSettings
 
             string areaName = null;
 
-            if (routeData.DataTokens.ContainsKey(DataTokensKeyArea))
+            if (
+                routeData.DataTokens.ContainsKey(DataTokensKeyArea) &&
+                routeData.DataTokens[DataTokensKeyArea] != null
+            )
             {
                 areaName = routeData.DataTokens[DataTokensKeyArea].ToString();
             }

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,10 @@ public string GenerateKey(ControllerContext context, CacheSettings cacheSettings`
`60`	`60`
`61`	`61`	`string areaName = null;`
`62`	`62`
`63`		`- if (routeData.DataTokens.ContainsKey(DataTokensKeyArea))`
	`63`	`+ if (`
	`64`	`+ routeData.DataTokens.ContainsKey(DataTokensKeyArea) &&`
	`65`	`+ routeData.DataTokens[DataTokensKeyArea] != null`
	`66`	`+ )`
`64`	`67`	`{`
`65`	`68`	`areaName = routeData.DataTokens[DataTokensKeyArea].ToString();`
`66`	`69`	`}`