Attachment #174305 for bug #319426

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Lines 2982-2987 Link Here

(-)foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/internal/descriptors/ObjectBuilder.java (+5 lines)
2982	if (clone instanceof ChangeTracker) {	2982	if (clone instanceof ChangeTracker) {
2983	((ChangeTracker)clone)._persistence_setPropertyChangeListener(null);	2983	((ChangeTracker)clone)._persistence_setPropertyChangeListener(null);
2984	}	2984	}
		2985	if(clone instanceof FetchGroupTracker) {
		2986	((FetchGroupTracker)clone)._persistence_setFetchGroup(null);
		2987	((FetchGroupTracker)clone)._persistence_setSession(null);
		2988	}
		2989	clearPrimaryKey(clone);
2985	return clone;	2990	return clone;
2986	}	2991	}
2987		2992

Lines 228-233 Link Here

(-)foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/mappings/CollectionMapping.java (+2 lines)
228	}	228	}
229	this.containerPolicy.addInto(copyValue, attributeValue, group.getSession());	229	this.containerPolicy.addInto(copyValue, attributeValue, group.getSession());
230	}	230	}
		231	// if value holder is used, then the value holder shared with original substituted for a new ValueHolder.
		232	getIndirectionPolicy().reset(copy);
231	setRealAttributeValueInObject(copy, attributeValue);	233	setRealAttributeValueInObject(copy, attributeValue);
232	}	234	}
233		235

Lines 389-394 Link Here

(-)foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/mappings/DirectCollectionMapping.java (+2 lines)
389	public void buildCopy(Object copy, Object original, CopyGroup group) {	389	public void buildCopy(Object copy, Object original, CopyGroup group) {
390	Object attributeValue = getRealCollectionAttributeValueFromObject(original, group.getSession());	390	Object attributeValue = getRealCollectionAttributeValueFromObject(original, group.getSession());
391	attributeValue = getContainerPolicy().cloneFor(attributeValue);	391	attributeValue = getContainerPolicy().cloneFor(attributeValue);
		392	// if value holder is used, then the value holder shared with original substituted for a new ValueHolder.
		393	getIndirectionPolicy().reset(copy);
392	setRealAttributeValueInObject(copy, attributeValue);	394	setRealAttributeValueInObject(copy, attributeValue);
393	}	395	}
394		396

Lines 93-98 Link Here

(-)foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/mappings/ObjectReferenceMapping.java (+2 lines)
93	attributeValue = copyValue;	93	attributeValue = copyValue;
94	}	94	}
95	}	95	}
		96	// if value holder is used, then the value holder shared with original substituted for a new ValueHolder.
		97	getIndirectionPolicy().reset(copy);
96	setRealAttributeValueInObject(copy, attributeValue);	98	setRealAttributeValueInObject(copy, attributeValue);
97	}	99	}
98		100

Lines 88-97 Link Here

(-)jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/tests/jpa/fieldaccess/fetchgroups/SimpleSerializeFetchGroupTests.java (-4 / +1 lines)
88	suite.addTest(new SimpleSerializeFetchGroupTests("copyWithoutPkUseFullGroup"));	88	suite.addTest(new SimpleSerializeFetchGroupTests("copyWithoutPkUseFullGroup"));
89	suite.addTest(new SimpleSerializeFetchGroupTests("copyNoCascade"));	89	suite.addTest(new SimpleSerializeFetchGroupTests("copyNoCascade"));
90	suite.addTest(new SimpleSerializeFetchGroupTests("copyCascadePrivateParts"));	90	suite.addTest(new SimpleSerializeFetchGroupTests("copyCascadePrivateParts"));
91	// The following test commented out due to:	91	suite.addTest(new SimpleSerializeFetchGroupTests("copyCascadeAllParts"));
92	// Bug 319426 - Original and copy share ValueHolder.
93	// Please uncomment when the bug is fixed.
94	//suite.addTest(new SimpleSerializeFetchGroupTests("copyCascadeAllParts"));
95		92
96	return suite;	93	return suite;
97	}	94	}

Return to bug 319426