Attachment 174305 Details for Bug 319426 – updated patch

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

[patch] updated patch

319426_100714.patch (text/plain), 4.46 KB, created by Andrei Ilitchev

on 2010-07-14 11:34:53 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Andrei Ilitchev

Created: 2010-07-14 11:34:53 EDT

Size: 4.46 KB

patch

obsolete

>Index: foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/internal/descriptors/ObjectBuilder.java
>===================================================================
>--- foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/internal/descriptors/ObjectBuilder.java	(revision 7816)
>+++ foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/internal/descriptors/ObjectBuilder.java	(working copy)
>@@ -2982,6 +2982,11 @@
>         if (clone instanceof ChangeTracker) {
>             ((ChangeTracker)clone)._persistence_setPropertyChangeListener(null);
>         }
>+        if(clone instanceof FetchGroupTracker) {
>+            ((FetchGroupTracker)clone)._persistence_setFetchGroup(null);
>+            ((FetchGroupTracker)clone)._persistence_setSession(null);
>+        }
>+        clearPrimaryKey(clone);
>         return clone;
>     }
> 
>Index: foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/mappings/CollectionMapping.java
>===================================================================
>--- foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/mappings/CollectionMapping.java	(revision 7816)
>+++ foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/mappings/CollectionMapping.java	(working copy)
>@@ -228,6 +228,8 @@
>             }
>             this.containerPolicy.addInto(copyValue, attributeValue, group.getSession());
>         }
>+        // if value holder is used, then the value holder shared with original substituted for a new ValueHolder.
>+        getIndirectionPolicy().reset(copy);
>         setRealAttributeValueInObject(copy, attributeValue);
>     }
> 
>Index: foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/mappings/DirectCollectionMapping.java
>===================================================================
>--- foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/mappings/DirectCollectionMapping.java	(revision 7816)
>+++ foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/mappings/DirectCollectionMapping.java	(working copy)
>@@ -389,6 +389,8 @@
>     public void buildCopy(Object copy, Object original, CopyGroup group) {
>         Object attributeValue = getRealCollectionAttributeValueFromObject(original, group.getSession());
>         attributeValue = getContainerPolicy().cloneFor(attributeValue);
>+        // if value holder is used, then the value holder shared with original substituted for a new ValueHolder.
>+        getIndirectionPolicy().reset(copy);
>         setRealAttributeValueInObject(copy, attributeValue);
>     }
> 
>Index: foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/mappings/ObjectReferenceMapping.java
>===================================================================
>--- foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/mappings/ObjectReferenceMapping.java	(revision 7816)
>+++ foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/mappings/ObjectReferenceMapping.java	(working copy)
>@@ -93,6 +93,8 @@
>                 attributeValue = copyValue;
>             }
>         }
>+        // if value holder is used, then the value holder shared with original substituted for a new ValueHolder.
>+        getIndirectionPolicy().reset(copy);
>         setRealAttributeValueInObject(copy, attributeValue);
>     }
> 
>Index: jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/tests/jpa/fieldaccess/fetchgroups/SimpleSerializeFetchGroupTests.java
>===================================================================
>--- jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/tests/jpa/fieldaccess/fetchgroups/SimpleSerializeFetchGroupTests.java	(revision 7816)
>+++ jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/tests/jpa/fieldaccess/fetchgroups/SimpleSerializeFetchGroupTests.java	(working copy)
>@@ -88,10 +88,7 @@
>         suite.addTest(new SimpleSerializeFetchGroupTests("copyWithoutPkUseFullGroup"));
>         suite.addTest(new SimpleSerializeFetchGroupTests("copyNoCascade"));
>         suite.addTest(new SimpleSerializeFetchGroupTests("copyCascadePrivateParts"));
>-        // The following test commented out due to: 
>-        // Bug 319426 - Original and copy share ValueHolder. 
>-        // Please uncomment when the bug is fixed.
>-        //suite.addTest(new SimpleSerializeFetchGroupTests("copyCascadeAllParts"));
>+        suite.addTest(new SimpleSerializeFetchGroupTests("copyCascadeAllParts"));
>         
>         return suite;
>     }

Actions: View | Diff

Attachments on bug 319426: 174160 | 174305