Permalink
Browse files

OPENJPA-2357: Fix InvalidStateException when using the InverseManager…

…. Fix contributed by Guillaume Chauvet.

git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@1461090 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
1 parent 6adc2f4 commit c9fa4b9bda45d0cb50274c8075a780b98b5951d4 Richard G. Curtis committed Mar 26, 2013
@@ -501,14 +501,13 @@ public boolean preFlush(boolean logical, OpCallbacks call) {
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);
}
/**
@@ -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();
+ }
+}

0 comments on commit c9fa4b9

Please sign in to comment.