[hibernate-commits] [hibernate/hibernate-orm] ca3cc5: HHH-5188 - Use provided enum type ordinal/string w...

[GitHub]

  Branch: refs/heads/4.1
  Home:   https://github.com/hibernate/hibernate-orm
  Commit: ca3cc50a2fcc050ad67186afa57d68f76a854165
      https://github.com/hibernate/hibernate-orm/commit/ca3cc50a2fcc050ad67186afa57d68f76a854165
  Author: Steve Ebersole <steve at hibernate.org>
  Date:   2012-09-03 (Mon, 03 Sep 2012)

  Changed paths:
    M hibernate-core/src/main/java/org/hibernate/type/EnumType.java
    M hibernate-core/src/main/java/org/hibernate/usertype/DynamicParameterizedType.java
    M hibernate-core/src/test/java/org/hibernate/test/annotations/embeddables/nested/NestedEmbeddableMetadataTest.java
    M hibernate-testing/src/main/java/org/hibernate/testing/junit4/ExtraAssertions.java

  Log Message:
  -----------
  HHH-5188 - Use provided enum type ordinal/string when reading
(cherry picked from commit 076eccb7a21d8cdbc820a5d089645fabe9d6b933)

Conflicts:

	hibernate-core/src/main/java/org/hibernate/type/EnumType.java
	hibernate-testing/src/main/java/org/hibernate/testing/junit4/ExtraAssertions.java