updated last match result bug

iamandycohen · Dec 19, 2014 · b31a407 · b31a407
1 parent 49e0284
commit b31a407
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/Hi.UrlRewrite/Processing/Results/ProcessRequestResult.cs b/Hi.UrlRewrite/Processing/Results/ProcessRequestResult.cs
@@ -10,10 +10,14 @@ public class ProcessRequestResult
         public ProcessRequestResult(Uri originalUri, RuleResult finalRuleResult, bool matchedAtLeastOneRule, List<RuleResult> processedResults)
         {
             OriginalUri = originalUri;
-            RewrittenUri = finalRuleResult.RewrittenUri;
             MatchedAtLeastOneRule = matchedAtLeastOneRule;
             ProcessedResults = processedResults;
-            FinalAction = finalRuleResult.ResultAction;
+
+            if (finalRuleResult != null)
+            {
+                RewrittenUri = finalRuleResult.RewrittenUri;
+                FinalAction = finalRuleResult.ResultAction;
+            }
         }
 
         public Uri OriginalUri { get; set; }

diff --git a/Hi.UrlRewrite/Processing/UrlRewriter.cs b/Hi.UrlRewrite/Processing/UrlRewriter.cs
@@ -73,11 +73,6 @@ public ProcessRequestResult ProcessRequestUrl(Uri requestUri, List<InboundRule>
 
             var lastMatchedRuleResult = processedResults.FirstOrDefault(r => r.RuleMatched);
 
-            if (lastMatchedRuleResult == null)
-            {
-                return null;
-            }
-
             var finalResult = new ProcessRequestResult(originalUri, lastMatchedRuleResult, matchedAtLeastOneRule, processedResults);
 
             return finalResult;