From 43e315f10c6021ef46f403f17b473ffd98c8474a Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Sun, 19 Jul 2020 19:59:15 +0200 Subject: [PATCH] Unwrap SqlParameterValue for disposable value detection in cleanupParameters Closes gh-22972 --- .../jdbc/core/StatementCreatorUtils.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/StatementCreatorUtils.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/StatementCreatorUtils.java index 60223545ac..4d9da27bb5 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/StatementCreatorUtils.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/StatementCreatorUtils.java @@ -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"); * you may not use this file except in compliance with the License. @@ -312,7 +312,6 @@ public abstract class StatementCreatorUtils { else { ps.setClob(paramIndex, new StringReader(strVal), strVal.length()); } - return; } else { // Fallback: setString or setNString binding @@ -460,12 +459,17 @@ public abstract class StatementCreatorUtils { public static void cleanupParameters(@Nullable Collection paramValues) { if (paramValues != null) { for (Object inValue : paramValues) { - if (inValue instanceof DisposableSqlTypeValue) { - ((DisposableSqlTypeValue) inValue).cleanup(); + // Unwrap SqlParameterValue first... + if (inValue instanceof SqlParameterValue) { + inValue = ((SqlParameterValue) inValue).getValue(); } - else if (inValue instanceof SqlValue) { + // Check for disposable value types + if (inValue instanceof SqlValue) { ((SqlValue) inValue).cleanup(); } + else if (inValue instanceof DisposableSqlTypeValue) { + ((DisposableSqlTypeValue) inValue).cleanup(); + } } } }