Hibernate/hibernate-orm
1
0
Fork 0
mirror of https://github.com/hibernate/hibernate-orm synced 2025-02-10 05:04:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
- 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 f693f5c320
commit ee8f26a4be
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

@ -149,9 +149,11 @@ else if ( (isQuoted && meta.storesLowerCaseQuotedIdentifiers())
} }
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 );
@ -180,10 +182,13 @@ private void initSequences(Connection connection, Dialect dialect) throws SQLExc
} }
} }
finally { finally {
if ( rs != null ) {
rs.close(); rs.close();
}
if ( statement != null ) {
statement.close(); statement.close();
} }
}
} }
} }
} }