Skip to main content

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
[eclipselink-dev] Fix for bug 378512 checked in

Bug 378512 - IllegalArgumentException occurs during mergeChanges when using nested UoW with inheritance tree

- Changed code in MergeManager mergeChangesOfWorkingCopyIntoOriginal(Object clone, ObjectChangeSet objectChangeSet) to explicitly pass the the correct original version of a new object (specifically from a nested UnitOfWork) into the registerOriginalNewObjectFromNestedUnitOfWork() call
- Added regression test: NestedUnitOfWorkMergeIntoParentTest to: InheritanceTestModel with new test model classes Apple, Fruit, Pear, Teacher
- Small changes to CommitOrderTest to support new model classes

Testing: Core LRG & JPA LRG (ok)

Checked into trunk (2.4) at revision: 11279
Reviewed: Guy
2.3.x checkin pending

Back to the top