From b261d336b18ccf852d0def64cdfd852c052ef355 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Mon, 26 Jul 2010 12:33:37 +0000 Subject: [PATCH] HibernateJpaDialect correctly closes borrowed connections even for nested JDBC executions (SPR-7393) --- .../org/springframework/jdbc/datasource/ConnectionHolder.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/ConnectionHolder.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/ConnectionHolder.java index bc1428509c6..8b3e3f274b3 100644 --- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/ConnectionHolder.java +++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/ConnectionHolder.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2010 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. @@ -189,7 +189,7 @@ public class ConnectionHolder extends ResourceHolderSupport { @Override public void released() { super.released(); - if (this.currentConnection != null) { + if (!isOpen() && this.currentConnection != null) { this.connectionHandle.releaseConnection(this.currentConnection); this.currentConnection = null; }