Commits

Anonymous committed f6480e8

WW-2853 Struts 2.0.12 has broken Conversion Errors
The conversion errors were not been copied from the fake stack into the original one

git-svn-id: http://svn.opensymphony.com/svn/xwork/branches/2.0@1866e221344d-f017-0410-9bd5-d282ab1896d7

Comments (0)

Files changed (1)

src/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java

         }
 
         ValueStack newStack = ValueStackFactory.getFactory().createValueStack(stack);
-        if (newStack instanceof ClearableValueStack) {
+        boolean clearableStack = newStack instanceof ClearableValueStack;
+        if (clearableStack) {
             //if the stack's context can be cleared, do that to prevent OGNL
             //from having access to objects in the stack, see XW-641
             ((ClearableValueStack)newStack).clearContextValues();
                 }
             }
         }
+
+        if (clearableStack && (stack.getContext() != null) && (newStack.getContext() != null))
+            stack.getContext().put(ActionContext.CONVERSION_ERRORS, newStack.getContext().get(ActionContext.CONVERSION_ERRORS));
     }
 
     /**
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.