From 47a4873199d9f305a2410bfa80249b76303fb13e Mon Sep 17 00:00:00 2001 From: Vedran Pavic Date: Sun, 29 Sep 2019 22:12:30 +0200 Subject: [PATCH] Align TransactionOperations usage with Spring Framework 5.2.0.RELEASE See: #1506 --- .../session/jdbc/JdbcIndexedSessionRepository.java | 6 +++--- spring-session-samples/gradle/dependency-management.gradle | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/spring-session-jdbc/src/main/java/org/springframework/session/jdbc/JdbcIndexedSessionRepository.java b/spring-session-jdbc/src/main/java/org/springframework/session/jdbc/JdbcIndexedSessionRepository.java index 56fce740..ea6f2efd 100644 --- a/spring-session-jdbc/src/main/java/org/springframework/session/jdbc/JdbcIndexedSessionRepository.java +++ b/spring-session-jdbc/src/main/java/org/springframework/session/jdbc/JdbcIndexedSessionRepository.java @@ -434,7 +434,7 @@ public class JdbcIndexedSessionRepository @Override public void deleteById(final String id) { - this.transactionOperations.execute(() -> JdbcIndexedSessionRepository.this.jdbcOperations + this.transactionOperations.executeWithoutResult((status) -> JdbcIndexedSessionRepository.this.jdbcOperations .update(JdbcIndexedSessionRepository.this.deleteSessionQuery, id)); } @@ -776,7 +776,7 @@ public class JdbcIndexedSessionRepository private void save() { if (this.isNew) { - JdbcIndexedSessionRepository.this.transactionOperations.execute(() -> { + JdbcIndexedSessionRepository.this.transactionOperations.executeWithoutResult((status) -> { Map indexes = JdbcIndexedSessionRepository.this.indexResolver .resolveIndexesFor(JdbcSession.this); JdbcIndexedSessionRepository.this.jdbcOperations @@ -796,7 +796,7 @@ public class JdbcIndexedSessionRepository }); } else { - JdbcIndexedSessionRepository.this.transactionOperations.execute(() -> { + JdbcIndexedSessionRepository.this.transactionOperations.executeWithoutResult((status) -> { if (JdbcSession.this.changed) { Map indexes = JdbcIndexedSessionRepository.this.indexResolver .resolveIndexesFor(JdbcSession.this); diff --git a/spring-session-samples/gradle/dependency-management.gradle b/spring-session-samples/gradle/dependency-management.gradle index ee1a0cd8..8f24e124 100644 --- a/spring-session-samples/gradle/dependency-management.gradle +++ b/spring-session-samples/gradle/dependency-management.gradle @@ -1,3 +1,4 @@ +ext['spring-framework.version'] = '5.2.0.BUILD-SNAPSHOT' ext['webjars-locator-core.version'] = '0.38' dependencyManagement {