Author: fancy
Date: Fri Jan 23 10:23:04 2009
New Revision: 737131
URL: http://svn.apache.org/viewvc?rev=737131&view=rev
Log:
OPENJPA-863 Unexpected mere-cascade behavior when cascade.all/merge specified
on both sides of relationships
Committing patch provided by Sandhya Truraga
Added:
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestCascadeMerge.java
Modified:
openjpa/branches/1.3.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AttachManager.java
Modified:
openjpa/branches/1.3.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AttachManager.java
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AttachManager.java?rev=737131&r1=737130&r2=737131&view=diff
==============================================================================
---
openjpa/branches/1.3.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AttachManager.java
(original)
+++
openjpa/branches/1.3.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AttachManager.java
Fri Jan 23 10:23:04 2009
@@ -18,6 +18,7 @@
*/
package org.apache.openjpa.kernel;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
@@ -32,6 +33,7 @@
import org.apache.openjpa.event.LifecycleEvent;
import org.apache.openjpa.lib.util.Localizer;
import org.apache.openjpa.meta.ClassMetaData;
+import org.apache.openjpa.meta.FieldMetaData;
import org.apache.openjpa.meta.ValueMetaData;
import org.apache.openjpa.util.CallbackException;
import org.apache.openjpa.util.Exceptions;
@@ -57,6 +59,7 @@
private final boolean _copyNew;
private final boolean _failFast;
private final IdentityMap _attached = new IdentityMap();
+ private final Collection _visitedNodes = new ArrayList();
// reusable strategies
private AttachStrategy _version = null;
@@ -230,6 +233,13 @@
//### need to handle ACT_CASCADE
int action = processArgument(toAttach);
+ if ((action & OpCallbacks.ACT_RUN) == 0 &&
+ (action & OpCallbacks.ACT_CASCADE) != 0) {
+ if(_visitedNodes.contains(_broker.getStateManager(toAttach)))
+ return toAttach;
+ return handleCascade(toAttach,owner);
+ }
+
if ((action & OpCallbacks.ACT_RUN) == 0)
return toAttach;
@@ -242,6 +252,24 @@
owner, ownerMeta, explicit);
}
+ private Object handleCascade(Object toAttach, OpenJPAStateManager owner) {
+ FieldMetaData[] fields =
_broker.getStateManager(toAttach).getMetaData()
+ .getDefinedFields();
+ for (int i = 0; i < fields.length; i++) {
+ FieldMetaData fd = (FieldMetaData) fields[i];
+ if (fd.getElement().getCascadeAttach() == fd.CASCADE_IMMEDIATE) {
+ FieldMetaData[] inverseFieldMappings =
fd.getInverseMetaDatas();
+ if (inverseFieldMappings.length != 0) {
+ OpenJPAStateManager sm = _broker.getStateManager(toAttach);
+ _visitedNodes.add(sm);
+ getStrategy(toAttach).attachField(this, toAttach,
+ _broker.getStateManagerImpl(toAttach, true), fd, true);
+ }
+ }
+ }
+ return toAttach;
+ }
+
/**
* Determine the action to take on the given argument.
*/
Added:
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestCascadeMerge.java
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestCascadeMerge.java?rev=737131&view=auto
==============================================================================
---
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestCascadeMerge.java
(added)
+++
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestCascadeMerge.java
Fri Jan 23 10:23:04 2009
@@ -0,0 +1,78 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openjpa.persistence.detachment;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.persistence.EntityManager;
+
+import org.apache.openjpa.jdbc.kernel.EntityF;
+import org.apache.openjpa.jdbc.kernel.EntityG;
+import org.apache.openjpa.persistence.test.SingleEMFTestCase;
+
+public class TestCascadeMerge extends SingleEMFTestCase {
+
+ private EntityG enG1;
+ private EntityG enG2;
+
+ public void setUp() {
+ setUp(CLEAR_TABLES,EntityF.class, EntityG.class);
+
+ createTestData();
+ }
+
+ private void createTestData() {
+ enG1 = new EntityG();
+ enG1.setId(1);
+
+ enG2 = new EntityG();
+ enG2.setId(2);
+ }
+
+ public void testCascadeMerge() {
+ EntityManager em = emf.createEntityManager();
+ try {
+ em.getTransaction().begin();
+ EntityF enF = new EntityF();
+ enF.setId(1);
+ em.persist(enF);
+ em.getTransaction().commit();
+ em.close();
+
+ em = emf.createEntityManager();
+ em.getTransaction().begin();
+
+ EntityF enF1 = em.find(EntityF.class, 1);
+ enG1.setEntityF(enF1);
+ enG2.setEntityF(enF1);
+ List<EntityG> l = new ArrayList<EntityG>();
+ l.add(enG1);
+ l.add(enG2);
+ enF1.setListG(l);
+ em.merge(enG1);
+ em.getTransaction().commit();
+ }
+ finally {
+ if (em.getTransaction().isActive())
+ em.getTransaction().rollback();
+ em.close();
+ }
+ }
+}
