[hibernate-commits] [hibernate/hibernate-orm] 7ae53f: HHH-9231 HHH-5690 : Test cases for transactional c...

[GitHub]

  Branch: refs/heads/4.2
  Home:   https://github.com/hibernate/hibernate-orm
  Commit: 7ae53f6eb9361f45620eeef92b051d687e2c90d8
      https://github.com/hibernate/hibernate-orm/commit/7ae53f6eb9361f45620eeef92b051d687e2c90d8
  Author: Gail Badner <gbadner at redhat.com>
  Date:   2014-07-08 (Tue, 08 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
    M hibernate-infinispan/src/test/resources/org/hibernate/test/cache/infinispan/functional/Item.hbm.xml

  Log Message:
  -----------
  HHH-9231 HHH-5690 : Test cases for transactional cache strategy

(cherry picked from commit af5791f6dd5b8b82e4786a146375e583c12037b7)

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


  Commit: 0b0516870da7f75a8216f6000959d3bd1919e640
      https://github.com/hibernate/hibernate-orm/commit/0b0516870da7f75a8216f6000959d3bd1919e640
  Author: Galder Zamarreño <galder at zamarreno.com>
  Date:   2014-07-08 (Tue, 08 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)


  Commit: ec17bcbc2974ec975f5812c59fb1905df1cd44ce
      https://github.com/hibernate/hibernate-orm/commit/ec17bcbc2974ec975f5812c59fb1905df1cd44ce
  Author: Gail Badner <gbadner at redhat.com>
  Date:   2014-07-08 (Tue, 08 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: 4732c04f10d354711eb07f649cb0f32cabeabaf4
      https://github.com/hibernate/hibernate-orm/commit/4732c04f10d354711eb07f649cb0f32cabeabaf4
  Author: Gail Badner <gbadner at redhat.com>
  Date:   2014-07-08 (Tue, 08 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/728592007d9d...4732c04f10d3