Return and use local object

For constructor and function return coherence

Author: benaadams

src/Microsoft.AspNet.Http/Features/FeatureHelpers.cs

@@ -8,74 +8,86 @@ namespace Microsoft.AspNet.Http.Features
     internal sealed class FeatureHelpers
     {
         public static T GetAndCache<T>(
-            IFeatureCache cache, 
-            IFeatureCollection features, 
-            ref T cachedObject)
+                            IFeatureCache cache, 
+                            IFeatureCollection features, 
+                            ref T cachedObject)
         {
             cache.CheckFeaturesRevision();
-            if (cachedObject == null)
+
+            T obj = cachedObject;
+            if (obj == null)
             {
-                cachedObject = features.Get<T>();
+                obj = features.Get<T>();
+                cachedObject = obj;
             }
-            return cachedObject;
+            return obj;
         }
 
         public static T GetOrCreateAndCache<T>(
-            IFeatureCache cache, 
-            IFeatureCollection features,
-            Func<T> factory,
-            ref T cachedObject)
+                            IFeatureCache cache, 
+                            IFeatureCollection features,
+                            Func<T> factory,
+                            ref T cachedObject)
         {
             cache.CheckFeaturesRevision();
-            if (cachedObject == null)
+
+            T obj = cachedObject;
+            if (obj == null)
             {
-                cachedObject = features.Get<T>();
-                if (cachedObject == null)
+                obj = features.Get<T>();
+                if (obj == null)
                 {
-                    cachedObject = factory();
-                    features.Set(cachedObject);
+                    obj = factory();
+                    cachedObject = obj;
+                    features.Set(obj);
                 }
             }
-            return cachedObject;
+            return obj;
         }
 
         public static T GetOrCreateAndCache<T>(
-            IFeatureCache cache,
-            IFeatureCollection features, 
-            Func<IFeatureCollection, T> factory,
-            ref T cachedObject)
+                            IFeatureCache cache,
+                            IFeatureCollection features, 
+                            Func<IFeatureCollection, T> factory,
+                            ref T cachedObject)
         {
             cache.CheckFeaturesRevision();
-            if (cachedObject == null)
+
+            T obj = cachedObject;
+            if (obj == null)
             {
-                cachedObject = features.Get<T>();
-                if (cachedObject == null)
+                obj = features.Get<T>();
+                if (obj == null)
                 {
-                    cachedObject = factory(features);
-                    features.Set(cachedObject);
+                    obj = factory(features);
+                    cachedObject = obj;
+                    features.Set(obj);
                 }
             }
-            return cachedObject;
+            return obj;
         }
 
         public static T GetOrCreateAndCache<T>(
-            IFeatureCache cache,
-            IFeatureCollection features,
-            HttpRequest request,
-            Func<HttpRequest, T> factory,
-            ref T cachedObject)
+                            IFeatureCache cache,
+                            IFeatureCollection features,
+                            HttpRequest request,
+                            Func<HttpRequest, T> factory,
+                            ref T cachedObject)
         {
             cache.CheckFeaturesRevision();
-            if (cachedObject == null)
+
+            T obj = cachedObject;
+            if (obj == null)
             {
-                cachedObject = features.Get<T>();
-                if (cachedObject == null)
+                obj = features.Get<T>();
+                if (obj == null)
                 {
-                    cachedObject = factory(request);
-                    features.Set(cachedObject);
+                    obj = factory(request);
+                    cachedObject = obj;
+                    features.Set(obj);
                 }
             }
-            return cachedObject;
+            return obj;
         }
     }
 }