svn commit: r1461090 - in /openjpa/trunk: openjpa-kernel/src/main/java/org/apache/openjpa/kernel/SingleFieldManager.java openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestInverseManager.java

[cu...@apache.org]

Author: curtisr7
Date: Tue Mar 26 12:43:29 2013
New Revision: 1461090

URL: http://svn.apache.org/r1461090
Log:
OPENJPA-2357: Fix InvalidStateException when using the InverseManager. Fix contributed by Guillaume Chauvet.

Added:
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestInverseManager.java   (with props)
Modified:
    openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/SingleFieldManager.java

Modified: openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/SingleFieldManager.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/SingleFieldManager.java?rev=1461090&r1=1461089&r2=1461090&view=diff
==============================================================================
--- openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/SingleFieldManager.java (original)
+++ openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/SingleFieldManager.java Tue Mar 26 12:43:29 2013
@@ -501,14 +501,13 @@ class SingleFieldManager extends Transfe
         if (fmd.getDeclaredTypeCode() < JavaTypes.OBJECT)
             return false;
 
-        // perform pers-by-reach and dependent refs
-        boolean ret = preFlush(fmd, logical, call);
-
         // manage inverses
         InverseManager manager = _broker.getInverseManager();
         if (manager != null)
             manager.correctRelations(_sm, fmd, objval);
-        return ret;
+        
+        // perform pers-by-reach and dependent refs
+        return preFlush(fmd, logical, call);
     }
 
     /**

Added: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestInverseManager.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestInverseManager.java?rev=1461090&view=auto
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestInverseManager.java (added)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestInverseManager.java Tue Mar 26 12:43:29 2013
@@ -0,0 +1,47 @@
+/*
+ * 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.relations;
+
+import java.util.Arrays;
+
+import javax.persistence.EntityManager;
+
+import org.apache.openjpa.persistence.merge.model.Toy;
+import org.apache.openjpa.persistence.merge.model.ToyBox;
+import org.apache.openjpa.persistence.test.SingleEMFTestCase;
+
+public class TestInverseManager extends SingleEMFTestCase {
+    public void setUp() {
+        setUp(CLEAR_TABLES, Toy.class, ToyBox.class, "openjpa.InverseManager", "true(ManageLRS=true)");
+    }
+
+    public void testPersist() {
+        EntityManager em = emf.createEntityManager();
+
+        em.getTransaction().begin();
+        Toy t = new Toy(1);
+        ToyBox tb = new ToyBox(1);
+
+        tb.setToyList(Arrays.asList(new Toy[] { t }));
+        em.persist(tb);
+
+        em.getTransaction().commit();
+        em.close();
+    }
+}

Propchange: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestInverseManager.java
------------------------------------------------------------------------------
    svn:eol-style = native