Spring/spring-net
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix for SPRNET-1331

Browse Source
This commit is contained in:
eeichinger
2011-01-07 19:40:38 +00:00
parent df43bd8640
commit d0135e2a73
5 changed files with 94 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Spring/Spring.Core/Context/Support/ContextHandler.cs
View File

@@ -288,7 +288,7 @@ namespace Spring.Context.Support
// finally create the context instance
context = InstantiateContext(parentContext, configContext, contextName, contextType, caseSensitive, resources);
// and register with global context registry
if (AutoRegisterWithContextRegistry)
if (AutoRegisterWithContextRegistry && !ContextRegistry.IsContextRegistered(context.Name))
{
ContextRegistry.RegisterContext(context);
}

16
src/Spring/Spring.Web/Context/Support/WebContextHandler.cs
View File

@@ -70,7 +70,7 @@ namespace Spring.Context.Support
/// </summary>
protected override string GetContextName(object configContext, XmlElement contextElement)
{
string contextName = ((HttpConfigurationContext) configContext).VirtualPath;
string contextName = GetVirtualPath(configContext);
// NET 2.0 returns "/" for root path
if (contextName == "/")
{
@@ -104,8 +104,6 @@ namespace Spring.Context.Support
string contextName, Type contextType,
bool caseSensitive, string[] resources)
{
HttpConfigurationContext httpConfigurationContext = (HttpConfigurationContext) configContext;
// ASP.NET may scavenge it's configuration section cache if memory usage is too high.
// Thus a handler may be called more than once for the same context.
// Return registered context in this case.
@@ -122,7 +120,7 @@ namespace Spring.Context.Support
}
// for rewriting path during context instantiation
string vpath = httpConfigurationContext.VirtualPath;
string vpath = GetVirtualPath(configContext);
if (!vpath.EndsWith("/")) vpath = vpath + "/";
using (new HttpContextSwitch(vpath))
{
@@ -130,5 +128,15 @@ namespace Spring.Context.Support
base.InstantiateContext(parent, configContext, contextName, contextType, caseSensitive, resources);
}
}
private String GetVirtualPath(Object configContext)
{
HttpConfigurationContext httpConfigurationContext = (HttpConfigurationContext)configContext;
if (httpConfigurationContext != null)
{
return httpConfigurationContext.VirtualPath;
}
return String.Empty;
}
}
}