svn commit: r1498565 - in /openjpa/trunk: openjpa-kernel/src/main/java/org/apache/openjpa/kernel/VersionAttachStrategy.java openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/TestMerge.java

[jg...@apache.org]

Author: jgrassel
Date: Mon Jul  1 16:58:11 2013
New Revision: 1498565

URL: http://svn.apache.org/r1498565
Log:
OPENJPA-2405: EntityManager.merge does not work for entity that is managed by another EntityManager

Added:
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/TestMerge.java   (with props)
Modified:
    openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/VersionAttachStrategy.java

Modified: openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/VersionAttachStrategy.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/VersionAttachStrategy.java?rev=1498565&r1=1498564&r2=1498565&view=diff
==============================================================================
--- openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/VersionAttachStrategy.java (original)
+++ openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/VersionAttachStrategy.java Mon Jul  1 16:58:11 2013
@@ -77,7 +77,11 @@ class VersionAttachStrategy
             meta.getRepository().getConfiguration());
 
         boolean embedded = ownerMeta != null && ownerMeta.isEmbeddedPC();
-        boolean isNew = !broker.isDetached(pc);
+        
+        // OJ-2405: If toAttach has a StateManagerImpl, then it is important to check if it
+        // is being managed by different broker.  If it is, then it should not be
+        // considered "new".
+        boolean isNew = !broker.isDetached(pc) && !isManagedByAnotherPCtx(pc, broker);
         Object version = null;
         StateManagerImpl sm;
 
@@ -408,4 +412,18 @@ class VersionAttachStrategy
         }
         return false;
     }
+    
+    private static boolean isManagedByAnotherPCtx(PersistenceCapable pc, BrokerImpl broker) {        
+        StateManager sm = pc.pcGetStateManager();
+        if (sm != null && sm instanceof StateManagerImpl) {
+            StateManagerImpl smi = (StateManagerImpl) sm;
+            Broker associatedBroker = smi.getBroker(); 
+            
+            if (broker != associatedBroker) {
+                return true;
+            }
+        }
+        
+        return false;
+    }
 }

Added: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/TestMerge.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/TestMerge.java?rev=1498565&view=auto
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/TestMerge.java (added)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/TestMerge.java Mon Jul  1 16:58:11 2013
@@ -0,0 +1,65 @@
+/*
+ * 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.merge;
+
+import javax.persistence.EntityManager;
+
+import org.apache.openjpa.persistence.test.SQLListenerTestCase;
+
+public class TestMerge extends SQLListenerTestCase {
+    public void setUp() {
+        setUp(CLEAR_TABLES, Parent.class,
+            Child.class, GrandChild.class);
+        assertNotNull(emf);
+        populate();
+    }
+
+    public void testMergeManagedParent() {
+        System.out.println("Running testMergeManagedParent()...");
+        
+        System.out.println();
+        System.out.println("Exercising em #1...");
+        EntityManager em = emf.createEntityManager();
+        ParentPK pk = new ParentPK(1);
+        pk.setKey1("K1");
+        Parent parent = em.find(Parent.class, pk);
+            
+        System.out.println();
+        System.out.println("Exercising em #1...");
+        EntityManager em2 = emf.createEntityManager();
+        em2.getTransaction().begin();
+        Parent mergedParent = em2.merge(parent);
+        assertNotNull(mergedParent);
+        em2.getTransaction().commit();
+        em.close();
+        em2.close();
+    }
+    
+    private void populate() {
+        EntityManager em = emf.createEntityManager();
+        em.getTransaction().begin();
+        Parent p = new Parent();
+        p.setKey1("K1");
+        p.setKey2(1);
+        em.persist(p);
+        em.getTransaction().commit();
+        em.close();
+    }
+}

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