From e0e3dea06d19b408070acb4673c33291f1834672 Mon Sep 17 00:00:00 2001
From: Shad Storhaug <shad@shadstorhaug.com>
Date: Wed, 11 Jun 2014 02:49:21 +0700
Subject: [PATCH] Revert "Fixes #322, using custom URL resolver throws
 "multiple nodes with same URL" exception."

This reverts commit bc43bf9cad02f9bc640121e006b6fb685ad0fa12.
---
 .../ISiteMapNodeExtensions.cs                  | 18 ------------------
 .../Matching/SiteMapNodeUrlKey.cs              | 16 +---------------
 .../MvcSiteMapProvider.csproj                  |  1 -
 .../MvcSiteMapProvider/SiteMap.cs              |  8 +++++++-
 4 files changed, 8 insertions(+), 35 deletions(-)
 delete mode 100644 src/MvcSiteMapProvider/MvcSiteMapProvider/ISiteMapNodeExtensions.cs

diff --git a/src/MvcSiteMapProvider/MvcSiteMapProvider/ISiteMapNodeExtensions.cs b/src/MvcSiteMapProvider/MvcSiteMapProvider/ISiteMapNodeExtensions.cs
deleted file mode 100644
index 7121bb9d..00000000
--- a/src/MvcSiteMapProvider/MvcSiteMapProvider/ISiteMapNodeExtensions.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-using MvcSiteMapProvider.Web.UrlResolver;
-
-namespace MvcSiteMapProvider
-{
-    /// <summary>
-    /// Contains extension logic for the ISiteMapNode interface that is not user 
-    /// overridable.
-    /// </summary>
-    public static class ISiteMapNodeExtensions
-    {
-        public static bool UsesDefaultUrlResolver(this ISiteMapNode node)
-        {
-            return string.IsNullOrEmpty(node.UrlResolver) ||
-                typeof(SiteMapNodeUrlResolver).Equals(Type.GetType(node.UrlResolver, false));
-        }
-    }
-}
diff --git a/src/MvcSiteMapProvider/MvcSiteMapProvider/Matching/SiteMapNodeUrlKey.cs b/src/MvcSiteMapProvider/MvcSiteMapProvider/Matching/SiteMapNodeUrlKey.cs
index 646b8aa9..a73e25c9 100644
--- a/src/MvcSiteMapProvider/MvcSiteMapProvider/Matching/SiteMapNodeUrlKey.cs
+++ b/src/MvcSiteMapProvider/MvcSiteMapProvider/Matching/SiteMapNodeUrlKey.cs
@@ -23,21 +23,7 @@ IUrlPath urlPath
 
             // Host name in absolute URL overrides this one.
             this.hostName = node.HostName;
-
-            // Fixes #322 - If using a custom URL resolver, we need to account for the case that
-            // the URL will be provided by the resolver instead of specified explicitly.
-            if (!string.IsNullOrEmpty(node.UnresolvedUrl))
-            {
-                this.SetUrlValues(node.UnresolvedUrl);
-            }
-            else if (!node.UsesDefaultUrlResolver())
-            {
-                // For a custom URL resolver, if the unresolved URL property
-                // is not set use the one returned from the URL resolver.
-                // This ensures URLs that are unidentifiable by MVC can still
-                // be matched by URL.
-                this.SetUrlValues(node.Url);
-            }
+            this.SetUrlValues(node.UnresolvedUrl);
         }
          
         private readonly ISiteMapNode node;
diff --git a/src/MvcSiteMapProvider/MvcSiteMapProvider/MvcSiteMapProvider.csproj b/src/MvcSiteMapProvider/MvcSiteMapProvider/MvcSiteMapProvider.csproj
index 840e9c59..0b9852b2 100644
--- a/src/MvcSiteMapProvider/MvcSiteMapProvider/MvcSiteMapProvider.csproj
+++ b/src/MvcSiteMapProvider/MvcSiteMapProvider/MvcSiteMapProvider.csproj
@@ -198,7 +198,6 @@
     <Compile Include="Globalization\CultureContextFactory.cs" />
     <Compile Include="Globalization\ICultureContextFactory.cs" />
     <Compile Include="Globalization\ICultureContext.cs" />
-    <Compile Include="ISiteMapNodeExtensions.cs" />
     <Compile Include="ISiteMapNodeProvider.cs" />
     <Compile Include="ISiteMapSettings.cs" />
     <Compile Include="ISortable.cs" />
diff --git a/src/MvcSiteMapProvider/MvcSiteMapProvider/SiteMap.cs b/src/MvcSiteMapProvider/MvcSiteMapProvider/SiteMap.cs
index f3acfb32..3e6f6003 100644
--- a/src/MvcSiteMapProvider/MvcSiteMapProvider/SiteMap.cs
+++ b/src/MvcSiteMapProvider/MvcSiteMapProvider/SiteMap.cs
@@ -134,7 +134,7 @@ protected virtual void AddNodeInternal(ISiteMapNode node, ISiteMapNode parentNod
             lock (this.synclock)
             {
                 IUrlKey url = null;
-                bool isMvcUrl = string.IsNullOrEmpty(node.UnresolvedUrl) && node.UsesDefaultUrlResolver();
+                bool isMvcUrl = string.IsNullOrEmpty(node.UnresolvedUrl) && this.UsesDefaultUrlResolver(node);
 
                 // Only store URLs if they are clickable and are configured using the Url
                 // property or provided by a custom URL resolver.
@@ -816,6 +816,12 @@ protected virtual ISiteMapNode ReturnNodeIfAccessible(ISiteMapNode node)
             return null;
         }
 
+        protected virtual bool UsesDefaultUrlResolver(ISiteMapNode node)
+        {
+            return string.IsNullOrEmpty(node.UrlResolver) ||
+                typeof(MvcSiteMapProvider.Web.UrlResolver.SiteMapNodeUrlResolver).Equals(Type.GetType(node.UrlResolver, false));
+        }
+
         protected virtual void AssertSiteMapNodeConfigurationIsValid(ISiteMapNode node)
         {
             ThrowIfTitleNotSet(node);