[hibernate-commits] [hibernate/hibernate-orm] f759c1: HHH-9985 - bytecode enhancer - fix merge use case

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/hibernate/hibernate-orm
  Commit: f759c152e21486b7f677d8e8f84203b64a73b9a4
      https://github.com/hibernate/hibernate-orm/commit/f759c152e21486b7f677d8e8f84203b64a73b9a4
  Author: barreiro <lbbbarreiro at gmail.com>
  Date:   2015-07-29 (Wed, 29 Jul 2015)

  Changed paths:
    M hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/EntityEnhancer.java
    A hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/tracker/DirtyTracker.java
    R hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/tracker/SimpleDirtyTracker.java
    A hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/tracker/SimpleFieldTracker.java
    R hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/tracker/SortedDirtyTracker.java
    A hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/tracker/SortedFieldTracker.java
    M hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/EnhancerConstants.java
    M hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/interceptor/LazyAttributeLoader.java
    M hibernate-core/src/main/java/org/hibernate/engine/internal/AbstractEntityEntry.java
    M hibernate-core/src/main/java/org/hibernate/engine/spi/SelfDirtinessTracker.java
    M hibernate-core/src/main/java/org/hibernate/event/internal/DefaultMergeEventListener.java
    M hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/DecompileUtils.java
    M hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/tracker/DirtyTrackerTest.java

  Log Message:
  -----------
  HHH-9985 - bytecode enhancer - fix merge use case


  Commit: 716e954f4985c1632791d7817340f6cb3bbf47d9
      https://github.com/hibernate/hibernate-orm/commit/716e954f4985c1632791d7817340f6cb3bbf47d9
  Author: barreiro <lbbbarreiro at gmail.com>
  Date:   2015-07-29 (Wed, 29 Jul 2015)

  Changed paths:
    M hibernate-core/src/main/java/org/hibernate/event/internal/DefaultMergeEventListener.java
    M hibernate-core/src/main/java/org/hibernate/type/ComponentType.java
    M hibernate-core/src/main/java/org/hibernate/type/TypeHelper.java

  Log Message:
  -----------
  HHH-9985 - bytecode enhancer - fix merge use case for composites


Compare: https://github.com/hibernate/hibernate-orm/compare/463decd245ab...716e954f4985