Hibernate/hibernate-orm
1
0
Fork 0
mirror of https://github.com/hibernate/hibernate-orm synced 2025-02-17 00:24:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

HHH-9044 formatting, minor fixes

Browse Source
This commit is contained in:
Brett Meyer 2014-03-13 14:41:28 -04:00
parent 1e5444f07d
commit ac648cec15
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/StatementPreparerImpl.java
View File

@ -121,7 +121,7 @@ public PreparedStatement prepareStatement(String sql, final int autoGeneratedKey
jdbcCoordinator.executeBatch();
return new StatementPreparationTemplate( sql ) {
public PreparedStatement doPrepare() throws SQLException {
return connection().prepareStatement( sql, new int[]{ 1 } );
return connection().prepareStatement( sql, autoGeneratedKeys );
}
}.prepareStatement();
}

7
hibernate-core/src/main/java/org/hibernate/id/IdentifierGeneratorHelper.java
View File

@ -119,10 +119,11 @@ public static Serializable get(ResultSet rs, String identifier, Type type) throw
}
}
int columnCount = 1;
try{
try {
columnCount = rs.getMetaData().getColumnCount();
}catch(Exception e){
//Oracle driver will throw NPE
}
catch (Exception e) {
// Oracle driver can throw NPE on rs.getMetaData()
}
Class clazz = type.getReturnedClass();
if (columnCount == 1) {