[hibernate-commits] [hibernate/hibernate-orm] 3d2160: Test for HHH-5255

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/hibernate/hibernate-orm
  Commit: 3d21604602118110be0457ddb97eba04312c9b3c
      https://github.com/hibernate/hibernate-orm/commit/3d21604602118110be0457ddb97eba04312c9b3c
  Author: Andrei Ivanov <andrei.ivanov at gmail.com>
  Date:   2015-07-24 (Fri, 24 Jul 2015)

  Changed paths:
    M hibernate-core/src/test/java/org/hibernate/test/instrument/buildtime/InstrumentTest.java
    A hibernate-core/src/test/java/org/hibernate/test/instrument/cases/TestLazyBasicPropertyUpdateExecutable.java
    M hibernate-core/src/test/java/org/hibernate/test/instrument/runtime/AbstractTransformingClassLoaderInstrumentTestCase.java

  Log Message:
  -----------
  Test for HHH-5255

(cherry picked from commit e0347f81e86a4d31edbce79baf00c2182a9a6fd4)


  Commit: c00d4609efa61b32c2cb470aa5785284870a71b6
      https://github.com/hibernate/hibernate-orm/commit/c00d4609efa61b32c2cb470aa5785284870a71b6
  Author: Gail Badner <gbadner at redhat.com>
  Date:   2015-07-24 (Fri, 24 Jul 2015)

  Changed paths:
    M hibernate-core/src/main/java/org/hibernate/type/TypeHelper.java
    M hibernate-core/src/test/java/org/hibernate/test/instrument/buildtime/InstrumentTest.java
    A hibernate-core/src/test/java/org/hibernate/test/instrument/cases/TestLazyBasicFieldAccessExecutable.java
    A hibernate-core/src/test/java/org/hibernate/test/instrument/cases/TestLazyBasicPropertyAccessExecutable.java
    R hibernate-core/src/test/java/org/hibernate/test/instrument/cases/TestLazyBasicPropertyUpdateExecutable.java
    A hibernate-core/src/test/java/org/hibernate/test/instrument/domain/DocumentsPropAccess.hbm.xml
    M hibernate-core/src/test/java/org/hibernate/test/instrument/runtime/AbstractTransformingClassLoaderInstrumentTestCase.java

  Log Message:
  -----------
  HHH-5255 : Merge detached entity failed when the instrumented lazy property is initialized


Compare: https://github.com/hibernate/hibernate-orm/compare/539465915b8a...c00d4609efa6