[hibernate-commits] Hibernate SVN: r15697 - core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/id.

[hibernate-commits at lists.jboss.org]

Author: cbredesen
Date: 2008-12-15 12:21:10 -0500 (Mon, 15 Dec 2008)
New Revision: 15697

Modified:
   core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/id/IdentityGenerator.java
Log:
JBPAPP-1496 backported

Modified: core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/id/IdentityGenerator.java
===================================================================
--- core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/id/IdentityGenerator.java	2008-12-15 10:46:00 UTC (rev 15696)
+++ core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/id/IdentityGenerator.java	2008-12-15 17:21:10 UTC (rev 15697)
@@ -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();
+				}
+			}
 		}
 	}