From 393d4c69bfda82166d6ad5cb0ca9d9b9e3abda06 Mon Sep 17 00:00:00 2001
From: Dancovich <danilo.viana@serpro.gov.br>
Date: Wed, 8 Aug 2012 16:18:06 -0300
Subject: [PATCH] Desregistrando os pseudo-contextos no momento correto

---
 impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/StartupBootstrap.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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 4b3151c..2d0408f 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
@@ -127,7 +127,7 @@ public class StartupBootstrap extends AbstractBootstrap {
 				ClassLoader classLoader = ConfigurationLoader.getClassLoaderForClass(processor.getAnnotatedMethod()
 						.getDeclaringType().getJavaClass().getCanonicalName());
 
-				if (classLoader.equals(Thread.currentThread().getContextClassLoader())) {
+				if (Thread.currentThread().getContextClassLoader().equals(classLoader)) {
 					processor.process();
 
 					if (remove) {
@@ -140,7 +140,9 @@ public class StartupBootstrap extends AbstractBootstrap {
 			}
 		}
 
-		unloadTempContexts();
+		if (processors.isEmpty()){
+			unloadTempContexts();
+		}
 
 		if (failure != null) {
 			throw new DemoiselleException(failure);
--
libgit2 0.21.2