Description
In our current project we are upgrading struts 2.3.35 to 2.5.22 and we encounter some minor bug in below code of addParametersToContext method of StaticParametersInterceptor.
in method, code is like below.
if (overwrite) { if (previousParams != null) { combinedParams = combinedParams.withParent(previousParams); } if (newParams != null) { combinedParams = combinedParams.withExtraParams(newParams); } } else { if (newParams != null) { combinedParams = combinedParams.withExtraParams(newParams); } if (previousParams != null) { combinedParams = combinedParams.withParent(previousParams); } }
But here overwrite functionality will not work since only if condition order was changed in else condition of overwrite.
instead of this, as per me, code would be like below
if (overwrite) { if (previousParams != null) { combinedParams = combinedParams.withParent(previousParams); } if (newParams != null) { combinedParams = combinedParams.withExtraParams(newParams); } } else { if (newParams != null) { HttpParameters newHttpParameters = HttpParameters.create(newParams).build(); combinedParams = combinedParams.withParent(newParams); } if (previousParams != null) { combinedParams = combinedParams.withExtraParams(previousParams); } }
And that's how ac.setParameters(combinedParams.build()); will work because in build method, requestParameterMap will override parent parameters.