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

HHH-10198 - NPE in InformationExtractorJdbcDatabaseMetaDataImpl

This commit is contained in:
Andrea Boriero 2015-10-14 16:28:30 +01:00
parent 1729067cbc
commit 8298390dc6
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/InformationExtractorJdbcDatabaseMetaDataImpl.java
View File

@ -124,10 +124,13 @@ public class InformationExtractorJdbcDatabaseMetaDataImpl implements Information
} }
if ( resultSet.next() ) { if ( resultSet.next() ) {
final String catalogName = catalog == null ? "" : catalog.getCanonicalName();
final String schemaName = schema == null ? "" : schema.getCanonicalName();
log.debugf( log.debugf(
"Multiple schemas found with that name [%s.%s]", "Multiple schemas found with that name [%s.%s]",
catalog.getCanonicalName(), catalogName,
schema.getCanonicalName() schemaName
); );
} }
return true; return true;
@ -344,12 +347,14 @@ public class InformationExtractorJdbcDatabaseMetaDataImpl implements Information
if ( resultSet.next() ) { if ( resultSet.next() ) {
log.multipleTablesFound( tableName.render() ); log.multipleTablesFound( tableName.render() );
final String catalogName = catalog == null ? "" : catalog.render();
final String schemaName = schema == null ? "" : schema.render();
throw new SchemaExtractionException( throw new SchemaExtractionException(
String.format( String.format(
Locale.ENGLISH, Locale.ENGLISH,
"More than one table found in namespace (%s, %s) : %s", "More than one table found in namespace (%s, %s) : %s",
catalog.render(), catalogName,
schema.render(), schemaName,
tableName.render() tableName.render()
) )
); );