[Structuremap-commits] SF.net SVN: structuremap:[238] trunk/Source/StructureMap/Pipeline

[<jer...@us...>]

Revision: 238
          http://structuremap.svn.sourceforge.net/structuremap/?rev=238&view=rev
Author:   jeremydmiller
Date:     2009-04-19 22:07:52 +0000 (Sun, 19 Apr 2009)

Log Message:
-----------
little refactoring before starting the big restructuring around lifecycle

Modified Paths:
--------------
    trunk/Source/StructureMap/Pipeline/CacheInterceptor.cs
    trunk/Source/StructureMap/Pipeline/HttpContextBuildPolicy.cs
    trunk/Source/StructureMap/Pipeline/SingletonPolicy.cs
    trunk/Source/StructureMap/Pipeline/ThreadLocalStoragePolicy.cs

Modified: trunk/Source/StructureMap/Pipeline/CacheInterceptor.cs
===================================================================
--- trunk/Source/StructureMap/Pipeline/CacheInterceptor.cs	2009-04-19 20:45:09 UTC (rev 237)
+++ trunk/Source/StructureMap/Pipeline/CacheInterceptor.cs	2009-04-19 22:07:52 UTC (rev 238)
@@ -3,9 +3,9 @@
 
 namespace StructureMap.Pipeline
 {
-    public class InstanceCache : Cache<InstanceKey, object>
+    public class ObjectCache : Cache<InstanceKey, object>
     {
-        public InstanceCache(IBuildPolicy innerPolicy) : base(key => innerPolicy.Build(key.Session, key.PluginType, key.Instance))
+        public ObjectCache(IBuildPolicy innerPolicy) : base(key => innerPolicy.Build(key.Session, key.PluginType, key.Instance))
         {
         }
 
@@ -29,7 +29,6 @@
 
     public abstract class CacheInterceptor : IBuildInterceptor
     {
-        private readonly object _locker = new object();
         private IBuildPolicy _innerPolicy = new BuildPolicy();
 
         #region IBuildInterceptor Members
@@ -40,12 +39,12 @@
             set { _innerPolicy = value; }
         }
 
-        protected InstanceCache buildNewCache()
+        protected ObjectCache buildNewCache()
         {
-            return new InstanceCache(_innerPolicy);
+            return new ObjectCache(_innerPolicy);
         }
 
-        protected abstract InstanceCache findCache();
+        protected abstract ObjectCache findCache();
 
         public object Build(BuildSession buildSession, Type pluginType, Instance instance)
         {

Modified: trunk/Source/StructureMap/Pipeline/HttpContextBuildPolicy.cs
===================================================================
--- trunk/Source/StructureMap/Pipeline/HttpContextBuildPolicy.cs	2009-04-19 20:45:09 UTC (rev 237)
+++ trunk/Source/StructureMap/Pipeline/HttpContextBuildPolicy.cs	2009-04-19 22:07:52 UTC (rev 238)
@@ -19,7 +19,7 @@
             new HttpContextBuildPolicy().findCache().DisposeAndClear();
         }
 
-        protected override InstanceCache findCache()
+        protected override ObjectCache findCache()
         {
             IDictionary items = findHttpDictionary();
 
@@ -29,7 +29,7 @@
                 {
                     if (!items.Contains(ITEM_NAME))
                     {
-                        InstanceCache cache = buildNewCache();
+                        ObjectCache cache = buildNewCache();
                         items.Add(ITEM_NAME, cache);
 
                         return cache;
@@ -37,7 +37,7 @@
                 }
             }
 
-            return (InstanceCache) items[ITEM_NAME];
+            return (ObjectCache) items[ITEM_NAME];
         }
 
         protected virtual IDictionary findHttpDictionary()

Modified: trunk/Source/StructureMap/Pipeline/SingletonPolicy.cs
===================================================================
--- trunk/Source/StructureMap/Pipeline/SingletonPolicy.cs	2009-04-19 20:45:09 UTC (rev 237)
+++ trunk/Source/StructureMap/Pipeline/SingletonPolicy.cs	2009-04-19 22:07:52 UTC (rev 238)
@@ -6,9 +6,9 @@
     public class SingletonPolicy : CacheInterceptor
     {
         private readonly object _locker = new object();
-        private InstanceCache _cache;
+        private ObjectCache _cache;
 
-        protected override InstanceCache findCache()
+        protected override ObjectCache findCache()
         {
             if (_cache == null)
             {
@@ -24,7 +24,7 @@
             return _cache;
         }
 
-        public InstanceCache Cache
+        public ObjectCache Cache
         {
             get
             {

Modified: trunk/Source/StructureMap/Pipeline/ThreadLocalStoragePolicy.cs
===================================================================
--- trunk/Source/StructureMap/Pipeline/ThreadLocalStoragePolicy.cs	2009-04-19 20:45:09 UTC (rev 237)
+++ trunk/Source/StructureMap/Pipeline/ThreadLocalStoragePolicy.cs	2009-04-19 22:07:52 UTC (rev 238)
@@ -5,7 +5,7 @@
 {
     public class ThreadLocalStoragePolicy : CacheInterceptor
     {
-        [ThreadStatic] private static InstanceCache _cache;
+        [ThreadStatic] private static ObjectCache _cache;
         private readonly object _locker = new object();
 
         public static void DisposeAndClearAll()
@@ -27,7 +27,7 @@
             }
         }
 
-        protected override InstanceCache findCache()
+        protected override ObjectCache findCache()
         {
             guaranteeHashExists();
             return _cache;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.