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

- Protection against NPE in finally block
- Little formatting fixes

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

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