HHH-10269 : JDBC Statement is not closed if exception appeared during…

… query execution
hibernate · Mar 11, 2016 · bdb458a · bdb458a
1 parent 3e00630
commit bdb458a
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/Loader.java b/hibernate-core/src/main/java/org/hibernate/loader/Loader.java
@@ -2130,6 +2130,11 @@ protected final ResultSet getResultSet(
 			session.getJdbcCoordinator().afterStatementExecution();
 			throw sqle;
 		}
+		catch (HibernateException he) {
+			session.getJdbcCoordinator().getResourceRegistry().release( st );
+			session.getJdbcCoordinator().afterStatementExecution();
+			throw he;
+		}
 	}
 
 	protected void autoDiscoverTypes(ResultSet rs) {

diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/query/QueryTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/query/QueryTest.java
@@ -1055,4 +1055,20 @@ public void testTypedScalarQueries() {
 
 		em.close();
 	}
+
+	@Test
+	@TestForIssue( jiraKey = "HHH-10269")
+	public void testFailingNativeQuery() {
+		final EntityManager entityManager = getOrCreateEntityManager();
+		// Tests that Oracle does not run out of cursors.
+		for (int i = 0; i < 1000; i++) {
+			try {
+				entityManager.createNativeQuery("Select 1 from NotExistedTable").getResultList();
+				fail( "expected PersistenceException" );
+			} catch (PersistenceException e) {
+				// expected
+			}
+		}
+
+	}
 }