Author: cpopetz Date: 2009-04-14 13:38:24 -0400 (Tue, 14 Apr 2009) New Revision: 10406 Modified: trunk/src/wicket/org/jboss/seam/wicket/ioc/WicketHandler.java Log: Fix problem with instrumenting nested anonymous subclasses created from a parent constructor. Modified: trunk/src/wicket/org/jboss/seam/wicket/ioc/WicketHandler.java =================================================================== --- trunk/src/wicket/org/jboss/seam/wicket/ioc/WicketHandler.java 2009-04-14 17:37:23 UTC (rev 10405) +++ trunk/src/wicket/org/jboss/seam/wicket/ioc/WicketHandler.java 2009-04-14 17:38:24 UTC (rev 10406) @@ -68,7 +68,7 @@ } reentrant++; InstrumentedComponent enclosing = getEnclosingInstance(invocationContext.getBean()); - if (enclosing != null) + if (enclosing != null && enclosing.getHandler() != null) { enclosing.getHandler().injectEnclosingInstance(enclosing); } @@ -124,7 +124,7 @@ } } InstrumentedComponent enclosing = getEnclosingInstance(invocationContext.getBean()); - if (enclosing != null) + if (enclosing != null && enclosing.getHandler() != null) { enclosing.getHandler().disinjectEnclosingInstance(enclosing); }