[hibernate-commits] [hibernate/hibernate-orm] 44bc5f: HHH-9599 - AnnotationException occurs when applyin...

[GitHub]

  Branch: refs/heads/4.3
  Home:   https://github.com/hibernate/hibernate-orm
  Commit: 44bc5f2f8cee79116be27502c80a1a325bed54c8
      https://github.com/hibernate/hibernate-orm/commit/44bc5f2f8cee79116be27502c80a1a325bed54c8
  Author: Steve Ebersole <steve at hibernate.org>
  Date:   2015-03-20 (Fri, 20 Mar 2015)

  Changed paths:
    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

(cherry picked from commit 38c004431d006ac5173d0c095f97415b5e6267a6)

Conflicts:
	hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/ModelBinder.java
	hibernate-core/src/main/java/org/hibernate/cfg/annotations/SimpleValueBinder.java
	hibernate-core/src/main/java/org/hibernate/mapping/SimpleValue.java


  Commit: 14829949ad077160a591cb5153cf34c925634209
      https://github.com/hibernate/hibernate-orm/commit/14829949ad077160a591cb5153cf34c925634209
  Author: Steve Ebersole <steve at hibernate.org>
  Date:   2015-03-20 (Fri, 20 Mar 2015)

  Changed paths:
    M 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 - adjust test for 4.3 branch


Compare: https://github.com/hibernate/hibernate-orm/compare/b9aced4ab6e4...14829949ad07