Merge pull request #800 from caelum/fixingMessages

checking included before including

vraptor-core/src/main/java/br/com/caelum/vraptor/validator/Messages.java

@@ -22,10 +22,7 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.RequestScoped;
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
+import javax.enterprise.inject.Vetoed;
 
 import org.slf4j.Logger;
 
@@ -42,39 +39,14 @@
  * @since 4.1
  * @author Otávio S Garcia
  */
-@RequestScoped
+@Vetoed
 public class Messages {
 
-	public static final String ATTRIBUTE_KEY = "vmessages";
-
 	private final static Logger log = getLogger(Messages.class);
 
 	private Map<Severity, List<Message>> messages = new HashMap<>();
 	private boolean unhandledErrors = false;
 
-	private final HttpServletRequest request;
-
-	/**
-	 * @deprecated CDI eyes only
-	 */
-	protected Messages() {
-		this(null);
-	}
-
-	@Inject
-	public Messages(HttpServletRequest request) {
-		this.request = request;
-	}
-
-	/**
-	 * Put this instance into request attributes to allow this instance survive between requests using flash
-	 * scope.
-	 */
-	@PostConstruct
-	public void init() {
-		request.setAttribute(ATTRIBUTE_KEY, this);
-	}
-
 	public Messages add(Message message) {
 		get(message.getSeverity()).add(message);
 		if(Severity.ERROR.equals(message.getSeverity())) {

vraptor-core/src/main/java/br/com/caelum/vraptor/validator/MessagesProducer.java

@@ -0,0 +1,38 @@
+package br.com.caelum.vraptor.validator;
+
+import static com.google.common.base.Objects.firstNonNull;
+
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Produces;
+import javax.inject.Inject;
+
+import br.com.caelum.vraptor.Result;
+
+@RequestScoped
+public class MessagesProducer {
+
+	private static final String MESSAGES_KEY = "vmessages";
+
+	private final Result result;
+
+	/**
+	 * @deprecated CDI eyes only
+	 */
+	protected MessagesProducer() {
+		this(null);
+	}
+
+	@Inject
+	public MessagesProducer(Result result) {
+		this.result = result;
+	}
+
+	@Produces @RequestScoped
+	public Messages create() {
+		Messages messages = (Messages) result.included().get(MESSAGES_KEY);
+		messages = firstNonNull(messages, new Messages());
+		result.include(MESSAGES_KEY, messages);
+		return messages;
+	}
+
+}