Merge pull request caelum#1102 from cristianoperez/remove-unnecessary…

…-session-creation Remove unnecessary session creation
carlosspohr · Oct 17, 2017 · 7bce8e6 · 7bce8e6
2 parents dcbe485 + 77a261c
commit 7bce8e6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/vraptor-core/src/main/java/br/com/caelum/vraptor/core/JstlLocalization.java b/vraptor-core/src/main/java/br/com/caelum/vraptor/core/JstlLocalization.java
@@ -51,7 +51,7 @@ public class JstlLocalization {
 
 	private final HttpServletRequest request;
 
-	/** 
+	/**
 	 * @deprecated CDI eyes only
 	 */
 	protected JstlLocalization() {
@@ -119,7 +119,7 @@ private Object findByKey(String key) {
 			return value;
 		}
 
-		value = Config.get(request.getSession(), key);
+		value = Config.get(request.getSession(createNewSession()), key);
 		if (value != null) {
 			return value;
 		}
@@ -131,4 +131,8 @@ private Object findByKey(String key) {
 
 		return request.getServletContext().getInitParameter(key);
 	}
+
+	protected boolean createNewSession(){
+	    return false;
+	}
 }
diff --git a/vraptor-core/src/test/java/br/com/caelum/vraptor/core/JstlLocalizationTest.java b/vraptor-core/src/test/java/br/com/caelum/vraptor/core/JstlLocalizationTest.java
@@ -39,7 +39,7 @@
 
 /**
  * Test class for {@link JstlLocalization}.
- * 
+ *
  * @author Otávio Scherer Garcia
  */
 public class JstlLocalizationTest {
@@ -70,7 +70,7 @@ protected Object[][] getContents() {
 		LocalizationContext context = new LocalizationContext(bundle);
 		when(request.getAttribute(FMT_LOCALIZATION_CONTEXT + ".request")).thenReturn(context);
 
-		when(request.getSession()).thenReturn(session);
+		when(request.getSession(false)).thenReturn(session);
 		when(request.getServletContext()).thenReturn(servletContext);
 	}