[hibernate-commits] Hibernate SVN: r14098 - core/branches/Branch_3_2/src/org/hibernate/id.

[hibernate-commits at lists.jboss.org]

Author: gbadner
Date: 2007-10-18 02:17:56 -0400 (Thu, 18 Oct 2007)
New Revision: 14098

Modified:
   core/branches/Branch_3_2/src/org/hibernate/id/IdentityGenerator.java
Log:
HHH-1312 : Unclosed ResultSet when using Identity


Modified: core/branches/Branch_3_2/src/org/hibernate/id/IdentityGenerator.java
===================================================================
--- core/branches/Branch_3_2/src/org/hibernate/id/IdentityGenerator.java	2007-10-17 20:59:49 UTC (rev 14097)
+++ core/branches/Branch_3_2/src/org/hibernate/id/IdentityGenerator.java	2007-10-18 06:17:56 UTC (rev 14098)
@@ -71,10 +71,19 @@
 
 		public Serializable executeAndExtract(PreparedStatement insert) throws SQLException {
 			insert.executeUpdate();
-			return IdentifierGeneratorFactory.getGeneratedIdentity(
-					GetGeneratedKeysHelper.getGeneratedKey( insert ),
-			        persister.getIdentifierType()
-			);
+			ResultSet rs = null;
+			try {
+				rs = GetGeneratedKeysHelper.getGeneratedKey( insert );
+				return IdentifierGeneratorFactory.getGeneratedIdentity(
+					rs,
+					persister.getIdentifierType()
+				);
+			}
+			finally {
+				if ( rs != null ) {
+					rs.close();
+				}
+			}
 		}
 	}