Branch: refs/heads/master Home: https://github.com/hibernate/hibernate-orm Commit: cf91fd7a4930052bfea4306866568da68ec261e8 https://github.com/hibernate/hibernate-orm/commit/cf91fd7a4930052bfea4306... Author: Brett Meyer <brett(a)3riverdev.com&gt; Date: 2013-05-10 (Fri, 10 May 2013) Changed paths: M hibernate-core/src/main/java/org/hibernate/cfg/OneToOneSecondPass.java M hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/bidirectional/OneToOneWithDerivedIdentityTest.java Log Message: ----------- HHH-6813 @Id @OneToOne cause NullPointerException during query