Branch: refs/heads/4.2 Home: https://github.com/hibernate/hibernate-orm Commit: e361ad49fe9c4185927e4b09eee45a8999b0948f https://github.com/hibernate/hibernate-orm/commit/e361ad49fe9c4185927e4b0... Author: Brett Meyer <brett(a)3riverdev.com&gt; Date: 2013-05-16 (Thu, 16 May 2013) Changed paths: M hibernate-core/src/main/java/org/hibernate/cfg/BinderHelper.java M hibernate-core/src/main/java/org/hibernate/cfg/HbmBinder.java M hibernate-core/src/main/java/org/hibernate/cfg/OneToOneSecondPass.java M hibernate-core/src/main/java/org/hibernate/cfg/annotations/CollectionBinder.java M hibernate-core/src/main/java/org/hibernate/mapping/ManyToOne.java M hibernate-core/src/main/java/org/hibernate/mapping/OneToMany.java M hibernate-core/src/main/java/org/hibernate/mapping/OneToOne.java M hibernate-core/src/main/java/org/hibernate/mapping/ToOne.java M hibernate-core/src/main/java/org/hibernate/type/EntityType.java M hibernate-core/src/main/java/org/hibernate/type/ManyToOneType.java M hibernate-core/src/main/java/org/hibernate/type/OneToOneType.java M hibernate-core/src/main/java/org/hibernate/type/SpecialOneToOneType.java M hibernate-core/src/main/java/org/hibernate/type/TypeFactory.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