fixed webcontrol object naming compatibility issue

fixed factory product caching

Author: eeichinger

src/Spring/Spring.Core/Objects/Factory/Support/AbstractObjectFactory.cs

@@ -836,22 +836,23 @@ protected internal virtual object GetObjectForInstance(object instance, string n
 
                 if (factory.IsSingleton && ContainsSingleton(canonicalName))
                 {
-                    lock (factoryObjectProductCache)
+                    lock (factoryObjectProductCache.SyncRoot)
                     {
                         resultInstance = factoryObjectProductCache[canonicalName];
                         if (resultInstance == null)
                         {
                             resultInstance = GetObjectFromFactoryObject(factory, canonicalName, rod);
                             if (resultInstance != null)
                             {
-                                factoryObjectProductCache.Add(canonicalName, resultInstance);
+                                factoryObjectProductCache[canonicalName] = resultInstance;
                             }
-                            return resultInstance;
                         }
                     }
                 }
-
-                resultInstance = GetObjectFromFactoryObject(factory, canonicalName, rod);
+                else
+                {
+                    resultInstance = GetObjectFromFactoryObject(factory, canonicalName, rod);
+                }
 
                 if (resultInstance == null)
                 {

src/Spring/Spring.Web/Objects/Factory/Xml/WebObjectDefinitionParserHelper.cs

@@ -58,7 +58,7 @@ protected override string PostProcessObjectNameAndAliases(string objectName, Sys
                     objectName = webObjectNameGenerator.CreatePageDefinitionName(url);
                 }
 
-                // adjust aliases if necessary
+                // strip leading homepath symbol ('~') from aliases if necessary
                 for (int ai = 0; ai < aliases.Count; ai++)
                 {
                     string alias = (string)aliases[ai];
@@ -70,9 +70,14 @@ protected override string PostProcessObjectNameAndAliases(string objectName, Sys
             }
             else if (strTypeName.EndsWith(".ascx") || strTypeName.EndsWith(".master"))
             {
+                string controlName = webObjectNameGenerator.CreateControlDefinitionName(url);
                 if (!StringUtils.HasText(objectName))
                 {
-                    objectName = webObjectNameGenerator.CreateControlDefinitionName(url);
+                    objectName = controlName;
+                }
+                else
+                {
+                    aliases.Add(controlName);
                 }
             }