diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/StartupBootstrap.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/StartupBootstrap.java index 1ae54ee..4b3151c 100644 --- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/StartupBootstrap.java +++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/StartupBootstrap.java @@ -55,6 +55,7 @@ import javax.enterprise.inject.spi.ProcessAnnotatedType; import br.gov.frameworkdemoiselle.DemoiselleException; import br.gov.frameworkdemoiselle.annotation.Startup; import br.gov.frameworkdemoiselle.annotation.ViewScoped; +import br.gov.frameworkdemoiselle.internal.configuration.ConfigurationLoader; import br.gov.frameworkdemoiselle.internal.context.ThreadLocalContext; import br.gov.frameworkdemoiselle.internal.processor.StartupProcessor; @@ -123,10 +124,15 @@ public class StartupBootstrap extends AbstractBootstrap { StartupProcessor processor = iter.next(); try { - processor.process(); + ClassLoader classLoader = ConfigurationLoader.getClassLoaderForClass(processor.getAnnotatedMethod() + .getDeclaringType().getJavaClass().getCanonicalName()); - if (remove) { - iter.remove(); + if (classLoader.equals(Thread.currentThread().getContextClassLoader())) { + processor.process(); + + if (remove) { + iter.remove(); + } } } catch (Throwable cause) { diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/processor/AnnotatedMethodProcessor.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/processor/AnnotatedMethodProcessor.java index cd04d13..e343099 100644 --- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/processor/AnnotatedMethodProcessor.java +++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/processor/AnnotatedMethodProcessor.java @@ -56,7 +56,7 @@ public class AnnotatedMethodProcessor extends AbstractProcessor { super(annotatedMethod, beanManager); } - protected AnnotatedMethod getAnnotatedMethod() { + public AnnotatedMethod getAnnotatedMethod() { return (AnnotatedMethod) getAnnotatedCallable(); } -- libgit2 0.21.2