Skip to content

Revert "fix: #14947 - class cast exception due to not using local variable #15152

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
+13 −7
Closed

Revert "fix: #14947 - class cast exception due to not using local variable #15152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
02d55f2
Revert "fix: #14947 - class cast exception due to not using local var…
codeconsole Oct 18, 2025
7c978e1
fix codestyle
codeconsole Oct 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions grails-controllers/src/main/groovy/org/grails/compiler/web/ControllerActionTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,7 @@
import static org.codehaus.groovy.ast.tools.GeneralUtils.declX;
import static org.codehaus.groovy.ast.tools.GeneralUtils.ifS;
import static org.codehaus.groovy.ast.tools.GeneralUtils.localVarX;
import static org.codehaus.groovy.ast.tools.GeneralUtils.nullX;
import static org.codehaus.groovy.ast.tools.GeneralUtils.stmt;
import static org.codehaus.groovy.ast.tools.GeneralUtils.ternaryX;
import static org.codehaus.groovy.ast.tools.GeneralUtils.varX;
import static org.grails.compiler.injection.GrailsASTUtils.applyDefaultMethodTarget;
import static org.grails.compiler.injection.GrailsASTUtils.applyMethodTarget;
Expand Down Expand Up @@ -888,11 +886,17 @@ protected void initializeStringParameter(final ClassNode classNode, final BlockS

final ClassNode paramTypeClassNode = param.getType();
final String methodParamName = param.getName();
Expression getParamsExpression = buildGetPropertyExpression(localVarX("this", classNode), "params", classNode);
final BooleanExpression containsKeyExpression = boolX(applyDefaultMethodTarget(callX(getParamsExpression, "containsKey", args(constX(requestParameterName))), Map.class));

wrapper.addStatement(stmt(declX(localVarX(methodParamName, paramTypeClassNode),
ternaryX(containsKeyExpression, buildGetMapExpression(getParamsExpression, requestParameterName), nullX()))));
Expression getParamsExpression = buildGetPropertyExpression(new VariableExpression("this"), "params", classNode);
final Expression paramsContainsKeyMethodArguments = new ArgumentListExpression(
new ConstantExpression(requestParameterName));
final BooleanExpression containsKeyExpression = new BooleanExpression(
applyDefaultMethodTarget(new MethodCallExpression(getParamsExpression, "containsKey", paramsContainsKeyMethodArguments), Map.class));
final Statement initializeParameterStatement = new ExpressionStatement(
new DeclarationExpression(new VariableExpression(
methodParamName, paramTypeClassNode),
Token.newSymbol(Types.EQUALS, 0, 0),
new TernaryExpression(containsKeyExpression, buildGetMapExpression(getParamsExpression, requestParameterName), new ConstantExpression(null))));
wrapper.addStatement(initializeParameterStatement);
}

protected void initializePrimitiveOrTypeWrapperParameter(final ClassNode classNode, final BlockStatement wrapper,
Expand Down
2 changes: 2 additions & 0 deletions .../app1/src/integration-test/groovy/functionaltests/commandobjects/CommandObjectSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,13 @@ package functionaltests.commandobjects
import grails.plugin.geb.ContainerGebSpec
import grails.testing.mixin.integration.Integration
import spock.lang.Issue
import spock.lang.PendingFeature

@Integration
@Issue('https://github.com/apache/grails-core/issues/14947')
class CommandObjectSpec extends ContainerGebSpec {

@PendingFeature
void 'should display the correct title on the home page'() {
when: 'visiting the home page'
go('/commandObject/echo?person=George+Doe')
Expand Down
Loading