From d884716956fcdb59ac6cae2c34ebd07a4831cb9d Mon Sep 17 00:00:00 2001
From: leekelleher <unknown@kiln.example.com>
Date: Fri, 1 Jun 2012 10:46:59 -0100
Subject: [PATCH] Fixed workitem: 30817 - FeedProxy ThreadAbortException Error
 Removed the Response.End, as wasn't really needed.

---
 umbraco/presentation/umbraco/dashboard/FeedProxy.aspx.cs | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/umbraco/presentation/umbraco/dashboard/FeedProxy.aspx.cs b/umbraco/presentation/umbraco/dashboard/FeedProxy.aspx.cs
index b6d44ff0ab..83aae970d0 100644
--- a/umbraco/presentation/umbraco/dashboard/FeedProxy.aspx.cs
+++ b/umbraco/presentation/umbraco/dashboard/FeedProxy.aspx.cs
@@ -4,11 +4,10 @@
     using System.Linq;
     using System.Net;
     using System.Net.Mime;
-    using System.Xml;
+    using umbraco;
     using umbraco.BasePages;
     using umbraco.BusinessLogic;
     using umbraco.IO;
-    using umbraco;
 
     public partial class FeedProxy : UmbracoEnsuredPage
     {
@@ -36,12 +35,12 @@
                                         Response.Clear();
                                         Response.ContentType = Request.QueryString["type"] ?? MediaTypeNames.Text.Xml;
                                         Response.Write(response);
-                                        Response.End();
                                     }
                                 }
-                            } else
+                            }
+                            else
                             {
-                                Log.Add(LogTypes.Error, -1, string.Format("Access to unallowed feedproxy attempted: {0}", requestUri));                                
+                                Log.Add(LogTypes.Error, -1, string.Format("Access to unallowed feedproxy attempted: {0}", requestUri));
                             }
                         }
                     }