Implementado método para determinar se o "store" de custom contexts foi

inicializado. Usa isso para evitar acesso desnecessário a getStore() e evitar um bug onde se criava um store (via getStore()) apenas para testar se ele está vazio.

Implementado método para determinar se o "store" de custom contexts foi
inicializado. Usa isso para evitar acesso desnecessário a getStore() e evitar um bug onde se criava um store (via getStore()) apenas para testar se ele está vazio.
Dancovich
1 parent e3193825
Showing 6 changed files with 28 additions and 5 deletions Show diff stats
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/CoreBootstrap.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/AbstractCustomContext.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/ContextManager.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/StaticContext.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/ThreadLocalContext.java
impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/context/ViewContext.java
@@ -91,13 +91,16 @@ public class CoreBootstrap implements Extension {
 		ContextManager.activate(StaticContext.class, StaticScoped.class);
 	}
+	
+	public void terminateCustomContexts(@Observes final BeforeShutdown event) {
+		ContextManager.shutdown();
+	}
 	public void takeOff(@Observes final AfterDeploymentValidation event) {
 		getLogger().info(getBundle().getString("taking-off"));
 	}
 	public void engineOff(@Observes final BeforeShutdown event) {
-		ContextManager.shutdown();
 		getLogger().info(getBundle().getString("engine-off"));
 	}
 }
@@ -58,12 +58,15 @@ public abstract class AbstractCustomContext implements CustomContext {
 	}
 	protected abstract Store getStore();
+	
+	protected abstract boolean isStoreInitialized();
 	@Override
 	public <T> T get(final Contextual<T> contextual) {
 		return get(contextual, null);
 	}
+	@SuppressWarnings("unchecked")
 	@Override
 	public <T> T get(final Contextual<T> contextual, final CreationalContext<T> creationalContext) {
 		T instance = null;
@@ -97,7 +100,9 @@ public abstract class AbstractCustomContext implements CustomContext {
 	public void setActive(boolean active) {
 		if (!active && this.active) {
 			// Limpando contexto
-			getStore().clear();
+			if (isStoreInitialized()){
+				getStore().clear();
+			}
 		}
 		this.active = active;
 	}
@@ -10,7 +10,6 @@ import javax.enterprise.context.ContextNotActiveException;
 import javax.enterprise.context.spi.Context;
 import javax.enterprise.inject.spi.AfterBeanDiscovery;
 import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.BeforeShutdown;
 import org.slf4j.Logger;
@@ -196,8 +195,7 @@ public class ContextManager {
 	/**
 	 * <p>
-	 * This method should be called when the application is shutting down, usually by observing the
-	 * {@link BeforeShutdown} event.
+	 * This method should be called when the application is shutting down.
 	 * </p>
 	 */
 	public static synchronized void shutdown() {
@@ -50,4 +50,9 @@ public class StaticContext extends AbstractCustomContext {
 	protected Store getStore() {
 		return store;
 	}
+
+	@Override
+	protected boolean isStoreInitialized() {
+		return store!=null;
+	}
 }
@@ -62,6 +62,11 @@ public class ThreadLocalContext extends AbstractCustomContext {
 	public ThreadLocalContext(final Class<? extends Annotation> scope) {
 		super(scope);
 	}
+	
+	@Override
+	protected boolean isStoreInitialized() {
+		return threadLocal.get()!=null;
+	}
 	@Override
 	protected Store getStore() {
@@ -38,6 +38,8 @@ package br.gov.frameworkdemoiselle.internal.context;
 import java.util.Map;
+import javax.faces.context.FacesContext;
+
 import br.gov.frameworkdemoiselle.annotation.ViewScoped;
 import br.gov.frameworkdemoiselle.util.Faces;
@@ -46,6 +48,11 @@ public class ViewContext extends AbstractCustomContext {
 	public ViewContext() {
 		super(ViewScoped.class);
 	}
+	
+	@Override
+	protected boolean isStoreInitialized() {
+		return FacesContext.getCurrentInstance()!=null;
+	}
 	@Override
 	protected Store getStore() {
	@@ -50,4 +50,9 @@ public class StaticContext extends AbstractCustomContext {		@@ -50,4 +50,9 @@ public class StaticContext extends AbstractCustomContext {
50	protected Store getStore() {	50	protected Store getStore() {
51	return store;	51	return store;
52	}	52	}
		53	+
		54	+ @Override
		55	+ protected boolean isStoreInitialized() {
		56	+ return store!=null;
		57	+ }
53	}	58	}