Commits

Anonymous committed 12cd925

Improved value stack creation to always include the current container

git-svn-id: http://svn.opensymphony.com/svn/xwork/trunk@1616e221344d-f017-0410-9bd5-d282ab1896d7

  • Participants
  • Parent commits 1822bd5

Comments (0)

Files changed (1)

src/java/com/opensymphony/xwork2/ognl/OgnlValueStackFactory.java

 import ognl.OgnlRuntime;
 import ognl.PropertyAccessor;
 
+import com.opensymphony.xwork2.ActionContext;
 import com.opensymphony.xwork2.TextProvider;
 import com.opensymphony.xwork2.conversion.NullHandler;
 import com.opensymphony.xwork2.conversion.impl.InstantiatingNullHandler;
     public ValueStack createValueStack() {
         ValueStack stack = new OgnlValueStack(xworkConverter, compoundRootAccessor, textProvider, allowStaticMethodAccess);
         container.inject(stack);
+        stack.getContext().put(ActionContext.CONTAINER, container);
         return stack;
     }
 
     public ValueStack createValueStack(ValueStack stack) {
         ValueStack result = new OgnlValueStack(stack, xworkConverter, compoundRootAccessor, allowStaticMethodAccess);
         container.inject(result);
+        stack.getContext().put(ActionContext.CONTAINER, container);
         return result;
     }