[hibernate-commits] [hibernate/hibernate-orm] b10963: HHH-6605: Merging changes by Michal Skowronek. Tha...
GitHub
noreply at github.com
Fri Jan 20 16:47:20 EST 2012
Branch: refs/heads/master
Home: https://github.com/hibernate/hibernate-orm
Commit: b109633b66c18f47b66ae496ef6c2bbad0dedcae
https://github.com/hibernate/hibernate-orm/commit/b109633b66c18f47b66ae496ef6c2bbad0dedcae
Author: Adam Warski <adam at warski.org>
Date: 2012-01-20 (Fri, 20 Jan 2012)
Changed paths:
M documentation/src/main/docbook/devguide/en-US/Envers.xml
M hibernate-envers/src/main/java/org/hibernate/envers/Audited.java
M hibernate-envers/src/main/java/org/hibernate/envers/configuration/GlobalConfiguration.java
M hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/AuditMetadataGenerator.java
M hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/ComponentMetadataGenerator.java
M hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/MetadataTools.java
M hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/reader/AuditedPropertiesReader.java
M hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/reader/ComponentAuditedPropertiesReader.java
M hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/reader/PropertyAuditingData.java
M hibernate-envers/src/main/java/org/hibernate/envers/entities/EntitiesConfigurations.java
M hibernate-envers/src/main/java/org/hibernate/envers/entities/PropertyData.java
M hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/ComponentPropertyMapper.java
M hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/MultiPropertyMapper.java
M hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/PropertyMapper.java
M hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/SinglePropertyMapper.java
M hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/SubclassPropertyMapper.java
M hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/AbstractCollectionMapper.java
M hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/OneToOneNotOwningMapper.java
M hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/ToOneIdMapper.java
M hibernate-envers/src/main/java/org/hibernate/envers/event/BaseEnversCollectionEventListener.java
M hibernate-envers/src/main/java/org/hibernate/envers/event/BaseEnversEventListener.java
M hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/AuditProperty.java
A hibernate-envers/src/main/java/org/hibernate/envers/query/property/ModifiedFlagPropertyName.java
M hibernate-envers/src/main/java/org/hibernate/envers/synchronization/work/AddWorkUnit.java
M hibernate-envers/src/main/java/org/hibernate/envers/synchronization/work/CollectionChangeWorkUnit.java
M hibernate-envers/src/main/java/org/hibernate/envers/synchronization/work/DelWorkUnit.java
M hibernate-envers/src/main/java/org/hibernate/envers/synchronization/work/FakeBidirectionalRelationWorkUnit.java
M hibernate-envers/src/matrix/java/org/hibernate/envers/test/AbstractOneSessionTest.java
A hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/AbstractModifiedFlagsEntityTest.java
A hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/AbstractModifiedFlagsOneSessionTest.java
A hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedAPITest.java
A hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedAuditedManyToManyTest.java
A hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedBidirectional2.java
A hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedChildAuditing.java
A hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedChildReferencing.java
A hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedComponentMapKey.java
A hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedComponents.java
A hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedCompositeCustom.java
A hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedDoubleJoinColumnBidirectionalList.java
A hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedEnumSet.java
A hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedForDefaultNotUsing.java
A hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedIdMapKey.java
A hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedManyToOneInComponent.java
A hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedNotOwnedBidirectional.java
A hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedNullProperties.java
A hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedOneToManyInComponent.java
A hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedStringMap.java
A hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedStringSet.java
A hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedUnversionedProperties.java
A hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/ModifiedFlagSuffix.java
A hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/entities/PartialModifiedFlagsEntity.java
A hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/entities/WithModifiedFlagReferencingEntity.java
M hibernate-envers/src/matrix/java/org/hibernate/envers/test/tools/TestTools.java
Log Message:
-----------
HHH-6605: Merging changes by Michal Skowronek. Thanks! Merge remote-tracking branch 'mskowron/change_info'
Conflicts:
hibernate-envers/src/main/java/org/hibernate/envers/configuration/GlobalConfiguration.java
hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/AuditMetadataGenerator.java
hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/ComponentMetadataGenerator.java
hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/MetadataTools.java
hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/reader/AuditedPropertiesReader.java
hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/ComponentPropertyMapper.java
hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/MultiPropertyMapper.java
hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/PropertyMapper.java
hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/SinglePropertyMapper.java
hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/SubclassPropertyMapper.java
hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/AbstractCollectionMapper.java
hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/OneToOneNotOwningMapper.java
hibernate-envers/src/main/java/org/hibernate/envers/event/BaseEnversCollectionEventListener.java
hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/AuditProperty.java
hibernate-envers/src/main/java/org/hibernate/envers/synchronization/work/AddWorkUnit.java
hibernate-envers/src/main/java/org/hibernate/envers/synchronization/work/CollectionChangeWorkUnit.java
hibernate-envers/src/main/java/org/hibernate/envers/synchronization/work/DelWorkUnit.java
hibernate-envers/src/main/java/org/hibernate/envers/synchronization/work/FakeBidirectionalRelationWorkUnit.java
hibernate-envers/src/main/java/org/hibernate/envers/tools/Tools.java
hibernate-envers/src/matrix/java/org/hibernate/envers/test/AbstractOneSessionTest.java
hibernate-envers/src/matrix/java/org/hibernate/envers/test/AbstractSessionTest.java
hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/components/relations/ManyToOneInComponent.java
hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/components/relations/NotAuditedManyToOneInComponent.java
hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/components/relations/OneToManyInComponent.java
hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/entityNames/singleAssociatedAudited/SingleDomainObjectToMultipleTablesTest.java
hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/notownedrelation/NotOwnedBidirectional.java
Commit: a00f23c6f66d87c51a1a2a58a0e7b1c51b505dec
https://github.com/hibernate/hibernate-orm/commit/a00f23c6f66d87c51a1a2a58a0e7b1c51b505dec
Author: Adam Warski <adam at warski.org>
Date: 2012-01-20 (Fri, 20 Jan 2012)
Changed paths:
M documentation/src/main/docbook/manual/en-US/content/events.xml
M hibernate-core/src/main/java/org/hibernate/Criteria.java
M hibernate-core/src/main/java/org/hibernate/Interceptor.java
A hibernate-core/src/main/java/org/hibernate/NaturalIdMutability.java
M hibernate-core/src/main/java/org/hibernate/Session.java
A hibernate-core/src/main/java/org/hibernate/SimpleNaturalIdLoadAccess.java
M hibernate-core/src/main/java/org/hibernate/Transaction.java
A hibernate-core/src/main/java/org/hibernate/action/internal/AbstractEntityInsertAction.java
M hibernate-core/src/main/java/org/hibernate/action/internal/EntityIdentityInsertAction.java
M hibernate-core/src/main/java/org/hibernate/action/internal/EntityInsertAction.java
A hibernate-core/src/main/java/org/hibernate/action/internal/UnresolvedEntityInsertActions.java
M hibernate-core/src/main/java/org/hibernate/annotations/NaturalId.java
M hibernate-core/src/main/java/org/hibernate/cache/package.html
M hibernate-core/src/main/java/org/hibernate/cache/spi/CacheDataDescription.java
M hibernate-core/src/main/java/org/hibernate/cache/spi/TransactionAwareCache.java
M hibernate-core/src/main/java/org/hibernate/cache/spi/access/SoftLock.java
M hibernate-core/src/main/java/org/hibernate/cache/spi/access/package.html
M hibernate-core/src/main/java/org/hibernate/cache/spi/entry/package.html
A hibernate-core/src/main/java/org/hibernate/cache/spi/package.html
M hibernate-core/src/main/java/org/hibernate/cfg/BinderHelper.java
M hibernate-core/src/main/java/org/hibernate/cfg/Configuration.java
M hibernate-core/src/main/java/org/hibernate/cfg/HbmBinder.java
M hibernate-core/src/main/java/org/hibernate/cfg/annotations/PropertyBinder.java
M hibernate-core/src/main/java/org/hibernate/cfg/annotations/TableBinder.java
M hibernate-core/src/main/java/org/hibernate/criterion/Subqueries.java
M hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java
M hibernate-core/src/main/java/org/hibernate/dialect/Oracle9iDialect.java
M hibernate-core/src/main/java/org/hibernate/dialect/SQLServer2005Dialect.java
M hibernate-core/src/main/java/org/hibernate/engine/internal/ForeignKeys.java
A hibernate-core/src/main/java/org/hibernate/engine/internal/NonNullableTransientDependencies.java
M hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java
M hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/ExtractedDatabaseMetaData.java
M hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/JdbcCoordinator.java
M hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/LogicalConnection.java
M hibernate-core/src/main/java/org/hibernate/engine/loading/internal/EntityLoadContext.java
M hibernate-core/src/main/java/org/hibernate/engine/loading/internal/LoadContexts.java
M hibernate-core/src/main/java/org/hibernate/engine/spi/ActionQueue.java
M hibernate-core/src/main/java/org/hibernate/engine/spi/Mapping.java
M hibernate-core/src/main/java/org/hibernate/engine/spi/PersistenceContext.java
M hibernate-core/src/main/java/org/hibernate/engine/spi/QueryParameters.java
M hibernate-core/src/main/java/org/hibernate/engine/spi/SessionFactoryImplementor.java
M hibernate-core/src/main/java/org/hibernate/event/internal/AbstractSaveEventListener.java
M hibernate-core/src/main/java/org/hibernate/event/internal/DefaultMergeEventListener.java
M hibernate-core/src/main/java/org/hibernate/hql/internal/ast/InvalidWithClauseException.java
M hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/SelectExpression.java
M hibernate-core/src/main/java/org/hibernate/hql/internal/ast/util/LiteralProcessor.java
M hibernate-core/src/main/java/org/hibernate/integrator/spi/Integrator.java
M hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java
M hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java
M hibernate-core/src/main/java/org/hibernate/internal/StatelessSessionImpl.java
M hibernate-core/src/main/java/org/hibernate/internal/package.html
M hibernate-core/src/main/java/org/hibernate/jdbc/package.html
M hibernate-core/src/main/java/org/hibernate/loader/entity/UniqueEntityLoader.java
M hibernate-core/src/main/java/org/hibernate/mapping/Property.java
M hibernate-core/src/main/java/org/hibernate/metadata/ClassMetadata.java
M hibernate-core/src/main/java/org/hibernate/metamodel/binding/AssociationAttributeBinding.java
M hibernate-core/src/main/java/org/hibernate/metamodel/binding/SingularAssociationAttributeBinding.java
M hibernate-core/src/main/java/org/hibernate/metamodel/relational/Exportable.java
M hibernate-core/src/main/java/org/hibernate/metamodel/relational/Identifier.java
M hibernate-core/src/main/java/org/hibernate/persister/entity/EntityPersister.java
M hibernate-core/src/main/java/org/hibernate/proxy/AbstractSerializableProxy.java
M hibernate-core/src/main/java/org/hibernate/proxy/LazyInitializer.java
M hibernate-core/src/main/java/org/hibernate/sql/InFragment.java
M hibernate-core/src/main/java/org/hibernate/transform/CacheableResultTransformer.java
M hibernate-core/src/main/java/org/hibernate/tuple/entity/EntityMetamodel.java
M hibernate-core/src/main/java/org/hibernate/tuple/entity/EntityTuplizer.java
M hibernate-core/src/main/java/org/hibernate/type/Type.java
M hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/SqlTypeDescriptor.java
M hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/circle/identity/CascadeCircleIdentityIdTest.java
M hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/circle/sequence/CascadeCircleSequenceIdTest.java
A hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/jpa/identity/AbstractEntity.java
A hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/jpa/identity/B.java
A hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/jpa/identity/C.java
A hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/jpa/identity/D.java
A hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/jpa/identity/E.java
A hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/jpa/identity/F.java
A hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/jpa/identity/G.java
A hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/jpa/identity/MultiCircleJpaCascadeIdentityTest.java
A hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/jpa/sequence/AbstractEntity.java
A hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/jpa/sequence/B.java
A hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/jpa/sequence/C.java
A hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/jpa/sequence/D.java
A hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/jpa/sequence/E.java
A hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/jpa/sequence/F.java
A hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/jpa/sequence/G.java
A hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/jpa/sequence/MultiCircleJpaCascadeSequenceTest.java
A hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/identity/AbstractEntity.java
A hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/identity/B.java
A hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/identity/C.java
A hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/identity/D.java
A hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/identity/E.java
A hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/identity/F.java
A hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/identity/G.java
A hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/identity/MultiCircleNonJpaCascadeIdentityTest.java
A hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/sequence/AbstractEntity.java
A hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/sequence/B.java
A hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/sequence/C.java
A hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/sequence/D.java
A hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/sequence/E.java
A hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/sequence/F.java
A hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/sequence/G.java
A hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/sequence/MultiCircleNonJpaCascadeSequenceTest.java
M hibernate-core/src/matrix/java/org/hibernate/test/cascade/circle/MultiPathCircleCascade.hbm.xml
M hibernate-core/src/matrix/java/org/hibernate/test/cascade/circle/MultiPathCircleCascadeDelayedInsert.hbm.xml
M hibernate-core/src/matrix/java/org/hibernate/test/cascade/circle/MultiPathCircleCascadeDelayedInsertTest.java
M hibernate-core/src/matrix/java/org/hibernate/test/cascade/circle/MultiPathCircleCascadeTest.java
M hibernate-core/src/matrix/java/org/hibernate/test/jpa/naturalid/ImmutableNaturalIdTest.java
M hibernate-core/src/matrix/java/org/hibernate/test/legacy/FooBarTest.java
M hibernate-core/src/matrix/java/org/hibernate/test/legacy/LegacyTestCase.java
M hibernate-core/src/matrix/java/org/hibernate/test/legacy/ParentChildTest.java
M hibernate-core/src/matrix/java/org/hibernate/test/nonflushedchanges/CreateTest.java
M hibernate-core/src/matrix/java/org/hibernate/test/ops/SaveOrUpdateTest.java
M hibernate-entitymanager/src/main/java/org/hibernate/ejb/HibernateEntityManager.java
M hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/AbstractFromImpl.java
M hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/AuditEntityNameRegister.java
M hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/AuditMetadataGenerator.java
M hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/ToOneRelationMetadataGenerator.java
A hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/AbstractOneToOneMapper.java
A hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/AbstractToOneMapper.java
M hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/OneToOneNotOwningMapper.java
A hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/OneToOnePrimaryKeyJoinColumnMapper.java
M hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/ToOneIdMapper.java
M hibernate-envers/src/main/java/org/hibernate/envers/reader/FirstLevelCache.java
A hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetoone/bidirectional/primarykeyjoincolumn/Account.java
A hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetoone/bidirectional/primarykeyjoincolumn/AccountNotAuditedOwners.java
A hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetoone/bidirectional/primarykeyjoincolumn/NotAuditedNoProxyPerson.java
A hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetoone/bidirectional/primarykeyjoincolumn/NotAuditedProxyPerson.java
A hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetoone/bidirectional/primarykeyjoincolumn/OneToOneWithPrimaryKeyJoinTest.java
A hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetoone/bidirectional/primarykeyjoincolumn/Person.java
M hibernate-infinispan/hibernate-infinispan.gradle
M hibernate-testing/src/main/java/org/hibernate/testing/DialectCheck.java
M hibernate-testing/src/main/java/org/hibernate/testing/OnExpectedFailure.java
M release/release.gradle
A release/src/javadoc/overview.html
R release/src/javadoc/package.html
Log Message:
-----------
Merge remote-tracking branch 'origin/master'
Conflicts:
hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/AuditMetadataGenerator.java
hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/OneToOneNotOwningMapper.java
hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/ToOneIdMapper.java
Commit: 89bb7ec1759dc9ec02f10d99ce2b58cb896c5f76
https://github.com/hibernate/hibernate-orm/commit/89bb7ec1759dc9ec02f10d99ce2b58cb896c5f76
Author: Adam Warski <adam at warski.org>
Date: 2012-01-20 (Fri, 20 Jan 2012)
Changed paths:
M hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/AbstractOneToOneMapper.java
M hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/OneToOneNotOwningMapper.java
M hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/ToOneIdMapper.java
Log Message:
-----------
HHH-6605: More conflicts merging
Commit: f434cd43118edd1e662aa398f7133263bd2151e0
https://github.com/hibernate/hibernate-orm/commit/f434cd43118edd1e662aa398f7133263bd2151e0
Author: Adam Warski <adam at warski.org>
Date: 2012-01-20 (Fri, 20 Jan 2012)
Changed paths:
M hibernate-envers/src/main/java/org/hibernate/envers/event/BaseEnversEventListener.java
M hibernate-envers/src/main/java/org/hibernate/envers/synchronization/work/CollectionChangeWorkUnit.java
Log Message:
-----------
HHH-6605: Fixing problems with lazy proxy initialization
Compare: https://github.com/hibernate/hibernate-orm/compare/e0a09db...f434cd4
More information about the hibernate-commits
mailing list