[hibernate-commits] [hibernate/hibernate-orm] 40a581: HHH-8721 CoreMessageLogger conflicts

[GitHub]

  Branch: refs/heads/4.2
  Home:   https://github.com/hibernate/hibernate-orm
  Commit: 40a58173adf170b79c5a62f50605c6da28983914
      https://github.com/hibernate/hibernate-orm/commit/40a58173adf170b79c5a62f50605c6da28983914
  Author: Brett Meyer <brett at 3riverdev.com>
  Date:   2013-11-19 (Tue, 19 Nov 2013)

  Changed paths:
    M hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java

  Log Message:
  -----------
  HHH-8721 CoreMessageLogger conflicts


  Commit: 5ac6e5b0f66f185f6ff831675eb3c95c32bcb712
      https://github.com/hibernate/hibernate-orm/commit/5ac6e5b0f66f185f6ff831675eb3c95c32bcb712
  Author: Steve Ebersole <steve at hibernate.org>
  Date:   2013-11-19 (Tue, 19 Nov 2013)

  Changed paths:
    M hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/TransactionCoordinatorImpl.java
    R hibernate-core/src/main/java/org/hibernate/engine/transaction/synchronization/internal/SynchronizationCallbackCoordinatorImpl.java
    A hibernate-core/src/main/java/org/hibernate/engine/transaction/synchronization/internal/SynchronizationCallbackCoordinatorNonTrackingImpl.java
    A hibernate-core/src/main/java/org/hibernate/engine/transaction/synchronization/internal/SynchronizationCallbackCoordinatorTrackingImpl.java
    M hibernate-core/src/main/java/org/hibernate/engine/transaction/synchronization/spi/SynchronizationCallbackCoordinator.java
    M hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java
    M hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java

  Log Message:
  -----------
  HHH-8709 - SynchronizationCallbackCoordinator is calling
Thread.currentThread way too often

Conflicts:
	hibernate-core/src/main/java/org/hibernate/engine/transaction/synchronization/internal/SynchronizationCallbackCoordinatorNonTrackingImpl.java
	hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java


Compare: https://github.com/hibernate/hibernate-orm/compare/328564e03883...5ac6e5b0f66f