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

HHH-10437 - Fix NPE in PrimaryKey#addColumn(Column column) when getTable().getNameIdentifier() is null

This commit is contained in:
Andrea Boriero 2016-01-12 16:15:16 +00:00
parent a4dbbf447d
commit 5b42faa134
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hibernate-core/src/main/java/org/hibernate/mapping/PrimaryKey.java
View File

@ -35,7 +35,7 @@ public class PrimaryKey extends Constraint {
log.debugf( log.debugf(
"Forcing column [%s] to be non-null as it is part of the primary key for table [%s]", "Forcing column [%s] to be non-null as it is part of the primary key for table [%s]",
column.getCanonicalName(), column.getCanonicalName(),
getTable().getNameIdentifier().getCanonicalName() getTableNameForLogging( column )
); );
} }
} }
@ -44,8 +44,13 @@ public class PrimaryKey extends Constraint {
protected String getTableNameForLogging(Column column) { protected String getTableNameForLogging(Column column) {
if ( getTable() != null ) { if ( getTable() != null ) {
if ( getTable().getNameIdentifier() != null ) {
return getTable().getNameIdentifier().getCanonicalName(); return getTable().getNameIdentifier().getCanonicalName();
} }
else {
return "<unknown>";
}
}
else if ( column.getValue() != null && column.getValue().getTable() != null ) { else if ( column.getValue() != null && column.getValue().getTable() != null ) {
return column.getValue().getTable().getNameIdentifier().getCanonicalName(); return column.getValue().getTable().getNameIdentifier().getCanonicalName();
} }