root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Restore original 4.x behavior for initialization of function return name 

Closes gh-25707
This commit is contained in:
Juergen Hoeller 2020-09-05 12:59:34 +02:00
parent c368ce8223
commit 40bf83c9e5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataContext.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2018 the original author or authors. * Copyright 2002-2020 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -355,7 +355,7 @@ public class CallMetaDataContext {
logger.debug("Using declared out parameter '" + paramName + logger.debug("Using declared out parameter '" + paramName +
"' for function return value"); "' for function return value");
} }
setFunctionReturnName(paramName); this.actualFunctionReturnName = paramName;
returnDeclared = true; returnDeclared = true;
} }
} }
@ -393,8 +393,8 @@ public class CallMetaDataContext {
"Unable to locate declared parameter for function return value - " + "Unable to locate declared parameter for function return value - " +
" add an SqlOutParameter with name '" + getFunctionReturnName() + "'"); " add an SqlOutParameter with name '" + getFunctionReturnName() + "'");
} }
else if (paramName != null) { else {
setFunctionReturnName(paramName); this.actualFunctionReturnName = param.getName();
} }
} }
else { else {
@ -422,7 +422,7 @@ public class CallMetaDataContext {
(StringUtils.hasLength(paramNameToUse) ? paramNameToUse : getFunctionReturnName()); (StringUtils.hasLength(paramNameToUse) ? paramNameToUse : getFunctionReturnName());
workParams.add(provider.createDefaultOutParameter(returnNameToUse, meta)); workParams.add(provider.createDefaultOutParameter(returnNameToUse, meta));
if (isFunction()) { if (isFunction()) {
setFunctionReturnName(returnNameToUse); this.actualFunctionReturnName = returnNameToUse;
outParamNames.add(returnNameToUse); outParamNames.add(returnNameToUse);
} }
if (logger.isDebugEnabled()) { if (logger.isDebugEnabled()) {