[Springnet-commits] Spring.Net/src/Spring/Spring.Web/Web/Support WebDependencyInjectionUtils.cs, 1.1, 1.2

[Erich E. <oak...@us...>]

Update of /cvsroot/springnet/Spring.Net/src/Spring/Spring.Web/Web/Support
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv30198/src/Spring/Spring.Web/Web/Support

Modified Files:
	WebDependencyInjectionUtils.cs 
Log Message:
fix for SPRNET-794

Index: WebDependencyInjectionUtils.cs
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/src/Spring/Spring.Web/Web/Support/WebDependencyInjectionUtils.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** WebDependencyInjectionUtils.cs	1 Aug 2007 23:11:01 -0000	1.1
--- WebDependencyInjectionUtils.cs	3 Feb 2008 21:38:27 -0000	1.2
***************
*** 54,57 ****
--- 54,63 ----
              if (control is LiteralControl) return; // nothing to do
  
+             ISupportsWebDependencyInjection diControl = control as ISupportsWebDependencyInjection;
+             if (diControl != null && diControl.DefaultApplicationContext != null)
+             {
+                 return; // nothing to do anymore - control cares for its children
+             }
+ 
              // "intercept" Control to make it DI-aware
              ControlInterceptor.EnsureControlIntercepted(appContext, control);