[hibernate-commits] [hibernate/hibernate-orm] 6145c9: HHH-9071 When an already initialized proxy is narr...

[GitHub]

  Branch: refs/heads/4.2
  Home:   https://github.com/hibernate/hibernate-orm
  Commit: 6145c9a66a708fdc7efc14d6093da012f882ce53
      https://github.com/hibernate/hibernate-orm/commit/6145c9a66a708fdc7efc14d6093da012f882ce53
  Author: Guillaume Smet <guillaume.smet at gmail.com>
  Date:   2014-03-21 (Fri, 21 Mar 2014)

  Changed paths:
    M hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java
    A hibernate-core/src/test/java/org/hibernate/test/proxy/narrow/AbstractEntity.java
    A hibernate-core/src/test/java/org/hibernate/test/proxy/narrow/ConcreteEntity.java
    A hibernate-core/src/test/java/org/hibernate/test/proxy/narrow/LazyAbstractEntityReference.java
    A hibernate-core/src/test/java/org/hibernate/test/proxy/narrow/ProxyNarrowingTest.java

  Log Message:
  -----------
  HHH-9071 When an already initialized proxy is narrowed, initialize the
new proxy (cherry picked from commit
2cf52cc7f1e1d8f918188d5166a3a869fc213cd8)

Conflicts:
	hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java


  Commit: c6fee189d58ab24c50d1444ba1be6a8ed144371e
      https://github.com/hibernate/hibernate-orm/commit/c6fee189d58ab24c50d1444ba1be6a8ed144371e
  Author: Steve Ebersole <steve at hibernate.org>
  Date:   2014-03-21 (Fri, 21 Mar 2014)

  Changed paths:
    M hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java
    M hibernate-core/src/test/java/org/hibernate/test/proxy/narrow/ProxyNarrowingTest.java

  Log Message:
  -----------
  HHH-9071 - Proxy narrowing loses the initialized state of the original
proxy (cherry picked from commit
c5bdec20b96a1179d70338644d8c2d5f1408001e)

Conflicts:
	hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java


Compare: https://github.com/hibernate/hibernate-orm/compare/b03dad009421...c6fee189d58a