[hibernate-commits] [hibernate/hibernate-orm] c668d2: Whitespace and style fixes (only)

[GitHub]

  Branch: refs/heads/4.2
  Home:   https://github.com/hibernate/hibernate-orm
  Commit: c668d292572e48952c8b9b79757558039ce862d5
      https://github.com/hibernate/hibernate-orm/commit/c668d292572e48952c8b9b79757558039ce862d5
  Author: Sanne Grinovero <sanne at hibernate.org>
  Date:   2013-11-16 (Sat, 16 Nov 2013)

  Changed paths:
    M hibernate-core/src/main/java/org/hibernate/engine/spi/EntityEntry.java
    M hibernate-core/src/main/java/org/hibernate/loader/Loader.java
    M hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java
    M hibernate-core/src/main/java/org/hibernate/persister/entity/EntityPersister.java

  Log Message:
  -----------
  Whitespace and style fixes (only)
(cherry picked from commit 0ba7c607780f5b48fc8958cabd1105e235c3dd61)

Conflicts:

	hibernate-core/src/main/java/org/hibernate/loader/Loader.java
	hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java


  Commit: 184c257f1d40dc85e6b8d9c39ba4bde91f0005c6
      https://github.com/hibernate/hibernate-orm/commit/184c257f1d40dc85e6b8d9c39ba4bde91f0005c6
  Author: Sanne Grinovero <sanne at hibernate.org>
  Date:   2013-11-16 (Sat, 16 Nov 2013)

  Changed paths:
    R hibernate-core/???:bad-url.lock.db
    M hibernate-core/src/main/java/org/hibernate/engine/internal/NonNullableTransientDependencies.java

  Log Message:
  -----------
  HHH-8681 NonNullableTransientDependencies should initialize identityMap lazily
(cherry picked from commit 46ed0bd7108c233e4e39e5ed884719be13a37704)

Conflicts:

	hibernate-core/src/main/java/org/hibernate/engine/internal/NonNullableTransientDependencies.java


  Commit: 1fd8f420e4ec8a83912442c0ec7197f61a3faba3
      https://github.com/hibernate/hibernate-orm/commit/1fd8f420e4ec8a83912442c0ec7197f61a3faba3
  Author: Sanne Grinovero <sanne at hibernate.org>
  Date:   2013-11-16 (Sat, 16 Nov 2013)

  Changed paths:
    M hibernate-core/src/main/java/org/hibernate/id/enhanced/Optimizer.java
    M hibernate-core/src/main/java/org/hibernate/id/enhanced/TableGenerator.java

  Log Message:
  -----------
  HHH-8680 Relax synchronized block in TableGenerator#generate
(cherry picked from commit adbd987fff7bb3a00a5b407741fd8a4270763f19)

Conflicts:

	hibernate-core/src/main/java/org/hibernate/id/enhanced/NoopOptimizer.java


  Commit: 687b7718d944972a36c9d973f6955be9bb202d18
      https://github.com/hibernate/hibernate-orm/commit/687b7718d944972a36c9d973f6955be9bb202d18
  Author: Sanne Grinovero <sanne at hibernate.org>
  Date:   2013-11-16 (Sat, 16 Nov 2013)

  Changed paths:
    M hibernate-core/src/main/java/org/hibernate/engine/jdbc/ColumnNameCache.java
    M hibernate-core/src/main/java/org/hibernate/engine/jdbc/ResultSetWrapperProxy.java

  Log Message:
  -----------
  HHH-8698 ColumnNameCache wraps and unwraps int to Integer multiple times
(cherry picked from commit a0c0ea5361007c21563f5c5ca69489943eb62037)

Conflicts:

	hibernate-core/src/main/java/org/hibernate/engine/jdbc/ColumnNameCache.java
	hibernate-core/src/main/java/org/hibernate/engine/jdbc/ResultSetWrapperProxy.java


  Commit: 71d5a746e331d805f336585f72723d46e746adf4
      https://github.com/hibernate/hibernate-orm/commit/71d5a746e331d805f336585f72723d46e746adf4
  Author: Sanne Grinovero <sanne at hibernate.org>
  Date:   2013-11-16 (Sat, 16 Nov 2013)

  Changed paths:
    M hibernate-core/src/main/java/org/hibernate/loader/Loader.java

  Log Message:
  -----------
  HHH-8679 Relax synchronized block in Loader#wrapResultSetIfEnabled
(cherry picked from commit 8a0cf23f1f8a09dcec0c500f1504c33975f15ba4)


  Commit: 47114c35b290f36c4267554fbc065e9295b33aff
      https://github.com/hibernate/hibernate-orm/commit/47114c35b290f36c4267554fbc065e9295b33aff
  Author: Steve Ebersole <steve at hibernate.org>
  Date:   2013-11-16 (Sat, 16 Nov 2013)

  Changed paths:
    M hibernate-core/src/main/java/org/hibernate/engine/jdbc/ColumnNameCache.java

  Log Message:
  -----------
  HHH-8698 ColumnNameCache wraps and unwraps int to Integer multiple times


  Commit: 8ad5ddeebfa143db052cdfea604e2aa5ae2c1755
      https://github.com/hibernate/hibernate-orm/commit/8ad5ddeebfa143db052cdfea604e2aa5ae2c1755
  Author: Steve Ebersole <steve at hibernate.org>
  Date:   2013-11-16 (Sat, 16 Nov 2013)

  Changed paths:
    M hibernate-core/src/main/java/org/hibernate/id/enhanced/OptimizerFactory.java

  Log Message:
  -----------
  HHH-8680 Relax synchronized block in TableGenerator#generate


  Commit: bf26311474257c2f0118615e003553095c2d87b0
      https://github.com/hibernate/hibernate-orm/commit/bf26311474257c2f0118615e003553095c2d87b0
  Author: Sanne Grinovero <sanne at hibernate.org>
  Date:   2013-11-16 (Sat, 16 Nov 2013)

  Changed paths:
    A hibernate-core/src/main/java/org/hibernate/engine/internal/EssentialEntityPersisterDetails.java
    M hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java
    M hibernate-core/src/main/java/org/hibernate/engine/spi/EntityEntry.java
    M hibernate-core/src/main/java/org/hibernate/engine/spi/EntityKey.java
    M hibernate-core/src/main/java/org/hibernate/internal/AbstractSessionImpl.java
    A hibernate-core/src/main/java/org/hibernate/persister/entity/EntityEssentials.java
    M hibernate-core/src/main/java/org/hibernate/persister/entity/EntityPersister.java
    M hibernate-core/src/main/java/org/hibernate/pretty/MessageHelper.java

  Log Message:
  -----------
  HHH-8682 org.hibernate.engine.spi.EntityKey consumes a lot of memory
(cherry picked from commit 2235c43eaae36cc02f51276b69bd258d4ee17174)

Conflicts:

	hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java
	hibernate-core/src/main/java/org/hibernate/engine/spi/EntityKey.java
	hibernate-core/src/main/java/org/hibernate/persister/entity/EntityPersister.java


Compare: https://github.com/hibernate/hibernate-orm/compare/4605941df1a5...bf2631147425