[hibernate-commits] [hibernate/hibernate-orm] cf913c: HHH-9231 Avoid updating collection 2LC if contains...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/hibernate/hibernate-orm
  Commit: cf913c16d4bd8a09463bea2789f07f2e74a6f6c9
      https://github.com/hibernate/hibernate-orm/commit/cf913c16d4bd8a09463bea2789f07f2e74a6f6c9
  Author: Galder Zamarreño <galder at zamarreno.com>
  Date:   2014-07-07 (Mon, 07 Jul 2014)

  Changed paths:
    M hibernate-core/src/main/java/org/hibernate/engine/loading/internal/CollectionLoadContext.java
    M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/BasicTransactionalTestCase.java

  Log Message:
  -----------
  HHH-9231 Avoid updating collection 2LC if contains entity added in tx

(cherry picked from commit 3b098a94d3463086a230d6dbc1254e9ecbf76cda)

Conflicts:
	hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/BasicTransactionalTestCase.java

(cherry picked from commit 36e35207f6f30f0236844dbcf898714070ad8cfe)

Conflicts:
	hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/BasicTransactionalTestCase.java


  Commit: ea388c8c82692b348df28e9cd9e1422f55a6fc12
      https://github.com/hibernate/hibernate-orm/commit/ea388c8c82692b348df28e9cd9e1422f55a6fc12
  Author: Gail Badner <gbadner at redhat.com>
  Date:   2014-07-07 (Mon, 07 Jul 2014)

  Changed paths:
    M hibernate-core/src/main/java/org/hibernate/engine/loading/internal/CollectionLoadContext.java

  Log Message:
  -----------
  HHH-9231 : Avoid updating collection 2LC if contains entity added in tx

(cherry picked from commit 4851ab01dfc2c58c19bf08a68854593923907716)


  Commit: aa5579ddffb954317a655f4354cd4f509dc5f630
      https://github.com/hibernate/hibernate-orm/commit/aa5579ddffb954317a655f4354cd4f509dc5f630
  Author: Gail Badner <gbadner at redhat.com>
  Date:   2014-07-07 (Mon, 07 Jul 2014)

  Changed paths:
    M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/BasicTransactionalTestCase.java
    M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/Item.java
    A hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/OtherItem.java
    M hibernate-infinispan/src/test/resources/org/hibernate/test/cache/infinispan/functional/Item.hbm.xml

  Log Message:
  -----------
  HHH-9231 : Uncommitted data can remain in transactional collection cache after rollback if collection is initialized after flush

(cherry picked from commit f9a49efd179f2c644674f9872d57a45f11a1dca3)


Compare: https://github.com/hibernate/hibernate-orm/compare/9d67bf32188b...aa5579ddffb9