Fixes #369, canonical URL and canonical key validation always throws …

…an exception when using .NET Attributes.
maartenba · Nov 2, 2014 · f300dc7 · f300dc7
1 parent 06b3f23
commit f300dc7
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/MvcSiteMapProvider/MvcSiteMapProvider/SiteMapNode.cs b/src/MvcSiteMapProvider/MvcSiteMapProvider/SiteMapNode.cs
@@ -465,7 +465,7 @@ public override string CanonicalKey
             {
                 if (!this.canonicalKey.Equals(value))
                 {
-                    if (!string.IsNullOrEmpty(this.canonicalUrl))
+                    if (!string.IsNullOrEmpty(value) && !string.IsNullOrEmpty(this.canonicalUrl))
                     {
                         throw new ArgumentException(string.Format(Resources.Messages.SiteMapNodeCanonicalValueAlreadySet, "CanonicalKey"), "CanonicalKey");
                     }
@@ -497,7 +497,7 @@ public override string CanonicalUrl
             {
                 if (!this.canonicalUrl.Equals(value))
                 {
-                    if (!string.IsNullOrEmpty(this.canonicalKey))
+                    if (!string.IsNullOrEmpty(value) && !string.IsNullOrEmpty(this.canonicalKey))
                     {
                         throw new ArgumentException(string.Format(Resources.Messages.SiteMapNodeCanonicalValueAlreadySet, "CanonicalUrl"), "CanonicalUrl");
                     }