diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/ShutdownBootstrap.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/ShutdownBootstrap.java index 88929e2..5b97469 100644 --- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/ShutdownBootstrap.java +++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/ShutdownBootstrap.java @@ -67,6 +67,8 @@ public class ShutdownBootstrap extends AbstractBootstrap { private static final Class annotationClass = Shutdown.class; private static final List tempContexts = new ArrayList(); + + private static AfterBeanDiscovery abdEvent; @SuppressWarnings("rawtypes") private static final List processors = Collections @@ -97,10 +99,7 @@ public class ShutdownBootstrap extends AbstractBootstrap { tempContexts.add(new ThreadLocalContext(SessionScoped.class, false)); tempContexts.add(new ThreadLocalContext(ConversationScoped.class)); tempContexts.add(new ThreadLocalContext(RequestScoped.class)); - - for (CustomContext tempContext : tempContexts) { - addContext(tempContext, event); - } + abdEvent = event; } /** @@ -114,6 +113,10 @@ public class ShutdownBootstrap extends AbstractBootstrap { Collections.sort(processors); Throwable failure = null; + for (CustomContext tempContext : tempContexts) { + addContext(tempContext, abdEvent); + } + for (Iterator iter = processors.iterator(); iter.hasNext();) { ShutdownProcessor processor = iter.next(); -- libgit2 0.21.2