From 894c8dbe2bac3210b95961ab40d4a131dc5e9a9f Mon Sep 17 00:00:00 2001
From: Chris R <Tratcher@outlook.com>
Date: Wed, 30 Sep 2015 14:31:03 -0700
Subject: [PATCH] Hosting#359 Remove IDisposable from HttpContext and
 IFeatureCollection.

---
 src/Microsoft.AspNet.Http.Abstractions/HttpContext.cs    | 4 +---
 src/Microsoft.AspNet.Http.Features/FeatureCollection.cs  | 5 -----
 src/Microsoft.AspNet.Http.Features/IFeatureCollection.cs | 2 +-
 src/Microsoft.AspNet.Http/DefaultHttpContext.cs          | 6 ------
 4 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/src/Microsoft.AspNet.Http.Abstractions/HttpContext.cs b/src/Microsoft.AspNet.Http.Abstractions/HttpContext.cs
index 8029c68641..7a7a35e543 100644
--- a/src/Microsoft.AspNet.Http.Abstractions/HttpContext.cs
+++ b/src/Microsoft.AspNet.Http.Abstractions/HttpContext.cs
@@ -10,7 +10,7 @@ using Microsoft.AspNet.Http.Features;
 
 namespace Microsoft.AspNet.Http
 {
-    public abstract class HttpContext : IDisposable
+    public abstract class HttpContext
     {
         public abstract IFeatureCollection Features { get; }
 
@@ -37,7 +37,5 @@ namespace Microsoft.AspNet.Http
         public abstract ISession Session { get; set; }
 
         public abstract void Abort();
-
-        public abstract void Dispose();
     }
 }
diff --git a/src/Microsoft.AspNet.Http.Features/FeatureCollection.cs b/src/Microsoft.AspNet.Http.Features/FeatureCollection.cs
index 25c86d06a9..eacad01a72 100644
--- a/src/Microsoft.AspNet.Http.Features/FeatureCollection.cs
+++ b/src/Microsoft.AspNet.Http.Features/FeatureCollection.cs
@@ -93,11 +93,6 @@ namespace Microsoft.AspNet.Http.Features
             }
         }
 
-        public virtual void Dispose()
-        {
-            _defaults?.Dispose();
-        }
-
         private class KeyComparer : IEqualityComparer<KeyValuePair<Type, object>>
         {
             public bool Equals(KeyValuePair<Type, object> x, KeyValuePair<Type, object> y)
diff --git a/src/Microsoft.AspNet.Http.Features/IFeatureCollection.cs b/src/Microsoft.AspNet.Http.Features/IFeatureCollection.cs
index 59741d9394..8da86ea5b9 100644
--- a/src/Microsoft.AspNet.Http.Features/IFeatureCollection.cs
+++ b/src/Microsoft.AspNet.Http.Features/IFeatureCollection.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
 
 namespace Microsoft.AspNet.Http.Features
 {
-    public interface IFeatureCollection : IEnumerable<KeyValuePair<Type, object>>, IDisposable
+    public interface IFeatureCollection : IEnumerable<KeyValuePair<Type, object>>
     {
         /// <summary>
         /// Indicates if the collection can be modified.
diff --git a/src/Microsoft.AspNet.Http/DefaultHttpContext.cs b/src/Microsoft.AspNet.Http/DefaultHttpContext.cs
index db0a4d27ad..29ad2e565c 100644
--- a/src/Microsoft.AspNet.Http/DefaultHttpContext.cs
+++ b/src/Microsoft.AspNet.Http/DefaultHttpContext.cs
@@ -165,11 +165,5 @@ namespace Microsoft.AspNet.Http.Internal
         {
             LifetimeFeature.Abort();
         }
-
-        public override void Dispose()
-        {
-            // REVIEW: is this necessary? is the environment "owned" by the context?
-            _features.Dispose();
-        }
     }
 }
\ No newline at end of file