Branch: refs/heads/4.3 Home: https://github.com/hibernate/hibernate-orm Commit: 5b08a506f041a6aff8c9659e835099c08f85abe7 https://github.com/hibernate/hibernate-orm/commit/5b08a506f041a6aff8c9659... Author: Steve Ebersole <steve(a)hibernate.org&gt; Date: 2015-03-19 (Thu, 19 Mar 2015) Changed paths: M hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/JavaConstantNode.java M hibernate-core/src/main/java/org/hibernate/type/StringRepresentableType.java A hibernate-core/src/main/java/org/hibernate/type/descriptor/java/EnumJavaTypeDescriptor.java M hibernate-core/src/main/java/org/hibernate/type/descriptor/java/JavaTypeDescriptorRegistry.java M hibernate-core/src/test/java/org/hibernate/test/type/AttributeConverterTest.java Log Message: ----------- HHH-8866 - HQL Query with enum and @Convert (cherry picked from commit bd8acaebcaa75410b40afb614fc825f61b1ca212) Conflicts: hibernate-core/src/test/java/org/hibernate/test/type/AttributeConverterTest.java