Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-9136 - DatabaseMetadata: NPE hides exception in finally block 

- Protection against NPE in finally block
- Little formatting fixes
This commit is contained in:
msulima 2014-04-20 14:12:20 +02:00 committed by Brett Meyer
parent d7173eeb3a
commit 3ad914d73f
1 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/DatabaseMetadata.java
View File

@ -148,9 +148,11 @@ public class DatabaseMetadata {
} }
finally { finally {
if ( rs != null ) {
rs.close(); rs.close();
} }
} }
}
catch (SQLException sqlException) { catch (SQLException sqlException) {
throw new SqlExceptionHelper( sqlExceptionConverter ) throw new SqlExceptionHelper( sqlExceptionConverter )
.convert( sqlException, "could not get table metadata: " + name ); .convert( sqlException, "could not get table metadata: " + name );
@ -179,10 +181,13 @@ public class DatabaseMetadata {
} }
} }
finally { finally {
if ( rs != null ) {
rs.close(); rs.close();
}
if ( statement != null ) {
statement.close(); statement.close();
} }
}
} }
} }
} }