Merge pull request #1554 from aleksandy/replace-stack

replace Stack by Deque

Author: xael-fry

framework/src/play/classloading/enhancers/LocalvariablesNamesEnhancer.java

@@ -1,11 +1,12 @@
 package play.classloading.enhancers;
 
 import java.lang.reflect.Field;
+import java.util.ArrayDeque;
 import java.util.ArrayList;
+import java.util.Deque;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Stack;
 
 import javassist.CtClass;
 import javassist.CtMethod;
@@ -172,7 +173,7 @@ public interface LocalVariablesSupport {
      */
     public static class LocalVariablesNamesTracer {
 
-        static final ThreadLocal<Stack<Map<String, Object>>> localVariables = new ThreadLocal<>();
+        static final ThreadLocal<Deque<Map<String, Object>>> localVariables = new ThreadLocal<>();
 
         public static void checkEmpty() {
             if (localVariables.get() != null && !localVariables.get().isEmpty()) {
@@ -186,9 +187,9 @@ public static void clear() {
 
         public static void enter() {
             if (localVariables.get() == null) {
-                localVariables.set(new Stack<Map<String, Object>>());
+                localVariables.set(new ArrayDeque<>());
             }
-            localVariables.get().push(new HashMap<String, Object>());
+            localVariables.get().push(new HashMap<>());
         }
 
         public static void exit() {
@@ -199,7 +200,7 @@ public static void exit() {
         }
 
         public static Map<String, Object> locals() {
-            if (localVariables.get() != null && !localVariables.get().empty()) {
+            if (localVariables.get() != null && !localVariables.get().isEmpty()) {
                 return localVariables.get().peek();
             }
             return new HashMap<>();
@@ -262,17 +263,17 @@ public static Object getLocalVariable(String variable) {
             return getLocalVariables().get(variable);
         }
 
-        public static Stack<Map<String, Object>> getLocalVariablesStateBeforeAwait() {
-            Stack<Map<String, Object>> state = localVariables.get();
+        public static Deque<Map<String, Object>> getLocalVariablesStateBeforeAwait() {
+            Deque<Map<String, Object>> state = localVariables.get();
             // must clear the ThreadLocal to prevent destroying the state when exit() is called due to
             // continuations-suspend
-            localVariables.set(new Stack<Map<String, Object>>());
+            localVariables.set(new ArrayDeque<>());
             return state;
         }
 
-        public static void setLocalVariablesStateAfterAwait(Stack<Map<String, Object>> state) {
+        public static void setLocalVariablesStateAfterAwait(Deque<Map<String, Object>> state) {
             if (state == null) {
-                state = new Stack<>();
+                state = new ArrayDeque<>();
             }
             localVariables.set(state);
         }

framework/src/play/mvc/Controller.java

@@ -7,10 +7,10 @@
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.lang.reflect.Type;
+import java.util.Deque;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Stack;
 import java.util.concurrent.Future;
 
 import org.apache.commons.javaflow.Continuation;
@@ -1122,7 +1122,7 @@ private static void storeOrRestoreDataStateForContinuations(Boolean isRestoring)
             // we are restoring after suspend
 
             // localVariablesState
-            Stack<Map<String, Object>> localVariablesState = (Stack<Map<String, Object>>) Http.Request.current().args
+            Deque<Map<String, Object>> localVariablesState = (Deque<Map<String, Object>>) Http.Request.current().args
                     .remove(ActionInvoker.CONTINUATIONS_STORE_LOCAL_VARIABLE_NAMES);
             LocalvariablesNamesEnhancer.LocalVariablesNamesTracer.setLocalVariablesStateAfterAwait(localVariablesState);