From 52446cb8f4b7a6d13c554e4bce58d0ecf131b5fb Mon Sep 17 00:00:00 2001
From: eeichinger <eeichinger@gmail.com>
Date: Wed, 1 Oct 2008 15:32:46 +0000
Subject: [PATCH] fixed SPRNET-1023

---
 .../Web/Support/ControlInterceptor.cs         | 39 +++++++++++++------
 1 file changed, 27 insertions(+), 12 deletions(-)

diff --git a/src/Spring/Spring.Web/Web/Support/ControlInterceptor.cs b/src/Spring/Spring.Web/Web/Support/ControlInterceptor.cs
index 43ad6cf9..9b08f9de 100644
--- a/src/Spring/Spring.Web/Web/Support/ControlInterceptor.cs
+++ b/src/Spring/Spring.Web/Web/Support/ControlInterceptor.cs
@@ -65,6 +65,16 @@ namespace Spring.Web.Support
         /// </summary>
         private static readonly Hashtable s_cachedInterceptionStrategies = new Hashtable();
 		
+        /// <summary>
+        /// Holds well-known Type/Strategy mappings.
+        /// </summary>
+        private static readonly Hashtable s_knownInterceptionStrategies = new Hashtable();
+
+        static ControlInterceptor()
+        {
+            s_knownInterceptionStrategies[typeof(ControlCollection)] = s_availableInterceptionStrategies[1];
+        }
+
         private ControlInterceptor()
         {
         }
@@ -119,19 +129,24 @@ namespace Spring.Web.Support
             }
             else
             {
-                // probe for a strategy
-                bool bOk = false;
-                for(int i=0;i<s_availableInterceptionStrategies.Length;i++)
+                // lookup well-known strategies
+                strategy = (IInterceptionStrategy) s_knownInterceptionStrategies[childControls.GetType()];
+                if (strategy == null)
                 {
-                    strategy = s_availableInterceptionStrategies[i];
-                    bOk = strategy.Intercept(defaultApplicationContext, ctlAccessor, ctlColAccessor);
-                    if (bOk) break;
-                }
-
-                if (!bOk)
-                {
-                    LogManager.GetLogger(typeof(ControlInterceptor)).Warn(string.Format("dependency injection not supported for control type {0}", ctlAccessor.GetTarget().GetType()));
-                    strategy = s_noopInterceptionStrategy;
+                    // probe for a strategy
+                    bool bOk = false;
+                    for (int i = 0; i < s_availableInterceptionStrategies.Length; i++)
+                    {
+                        strategy = s_availableInterceptionStrategies[i];
+                        bOk = strategy.Intercept( defaultApplicationContext, ctlAccessor, ctlColAccessor );
+                        if (bOk)
+                            break;
+                    }
+                    if (!bOk)
+                    {
+                        LogManager.GetLogger(typeof(ControlInterceptor)).Warn(string.Format("dependency injection not supported for control type {0}", ctlAccessor.GetTarget().GetType()));
+                        strategy = s_noopInterceptionStrategy;
+                    }
                 }
 
                 lock(s_cachedInterceptionStrategies)