Branch: refs/heads/master Home: https://github.com/hibernate/hibernate-orm Commit: 38c004431d006ac5173d0c095f97415b5e6267a6 https://github.com/hibernate/hibernate-orm/commit/38c004431d006ac5173d0c0... Author: Steve Ebersole <steve(a)hibernate.org&gt; Date: 2015-03-20 (Fri, 20 Mar 2015) Changed paths: M hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/ModelBinder.java M hibernate-core/src/main/java/org/hibernate/cfg/annotations/SimpleValueBinder.java M hibernate-core/src/main/java/org/hibernate/mapping/SimpleValue.java A hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/NationalizedTypeMappings.java A hibernate-core/src/test/java/org/hibernate/test/type/converter/AndNationalizedTests.java Log Message: ----------- HHH-9599 - AnnotationException occurs when applying @Nationalized and @Convert annotations to the same field