Attachment 160912 Details for Bug 304650 – Proposed quick fix

This Bugzilla instance is deprecated, and most Eclipse projects now use GitHub or Eclipse GitLab. Please see the deprecation plan for details.

[patch] Proposed quick fix

testSetRollbackOnly.patch (text/plain), 5.87 KB, created by Sabine Heider

on 2010-03-04 04:40:52 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Sabine Heider

Created: 2010-03-04 04:40:52 EST

Size: 5.87 KB

patch

obsolete

>Index: jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/tests/jpa/advanced/EntityManagerJUnitTestSuite.java
>===================================================================
>--- jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/tests/jpa/advanced/EntityManagerJUnitTestSuite.java	(revision 6703)
>+++ jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/tests/jpa/advanced/EntityManagerJUnitTestSuite.java	(working copy)
>@@ -981,15 +981,17 @@
>     public void testSetRollbackOnly(){
>         EntityManager em = createEntityManager();
>         beginTransaction(em);
>+        Employee emp;
>+        Employee emp2;
>         try{
>-            Employee emp = new Employee();
>+            emp = new Employee();
>             emp.setFirstName("Bob");
>             emp.setLastName("Fisher");
>             em.persist(emp);
>-            emp = new Employee();
>-            emp.setFirstName("Anthony");
>-            emp.setLastName("Walace");
>-            em.persist(emp);
>+            emp2 = new Employee();
>+            emp2.setFirstName("Anthony");
>+            emp2.setLastName("Walace");
>+            em.persist(emp2);
>             commitTransaction(em);
>         }catch (RuntimeException ex){
>             if (isTransactionActive(em)){
>@@ -1001,10 +1003,10 @@
>         clearCache();
>         em = createEntityManager();
>         beginTransaction(em);
>-        List result = em.createQuery("SELECT e FROM Employee e").getResultList();
>-        Employee emp = (Employee)result.get(0);
>+        List result = em.createQuery("SELECT e FROM Employee e where e.id = " + emp.getId() + " or e.id = " + emp2.getId()).getResultList();
>+        emp = (Employee)result.get(0);
>         emp.toString();
>-        Employee emp2 = (Employee)result.get(1);
>+        emp2 = (Employee)result.get(1);
>         String newName = ""+System.currentTimeMillis();
>         emp2.setFirstName(newName);
>         em.flush();
>Index: jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/tests/jpa/fieldaccess/advanced/EntityManagerJUnitTestSuite.java
>===================================================================
>--- jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/tests/jpa/fieldaccess/advanced/EntityManagerJUnitTestSuite.java	(revision 6703)
>+++ jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/tests/jpa/fieldaccess/advanced/EntityManagerJUnitTestSuite.java	(working copy)
>@@ -496,15 +496,17 @@
>     public void testSetRollbackOnly(){
>         EntityManager em = createEntityManager("fieldaccess");
>         beginTransaction(em);
>+        Employee emp;
>+        Employee emp2;
>         try{
>-            Employee emp = new Employee();
>+            emp = new Employee();
>             emp.setFirstName("Bob");
>             emp.setLastName("Fisher");
>             em.persist(emp);
>-            emp = new Employee();
>-            emp.setFirstName("Anthony");
>-            emp.setLastName("Walace");
>-            em.persist(emp);
>+            emp2 = new Employee();
>+            emp2.setFirstName("Anthony");
>+            emp2.setLastName("Walace");
>+            em.persist(emp2);
>             commitTransaction(em);
>         }catch (RuntimeException ex){
>             if (isTransactionActive(em)){
>@@ -516,10 +518,10 @@
>         clearCache("fieldaccess");
>         em = createEntityManager("fieldaccess");
>         beginTransaction(em);
>-        List result = em.createQuery("SELECT e FROM Employee e").getResultList();
>-        Employee emp = (Employee)result.get(0);
>+        List result = em.createQuery("SELECT e FROM Employee e where e.id = " + emp.getId() + " or e.id = " + emp2.getId()).getResultList();
>+        emp = (Employee)result.get(0);
>         emp.toString();
>-        Employee emp2 = (Employee)result.get(1);
>+        emp2 = (Employee)result.get(1);
>         String newName = ""+System.currentTimeMillis();
>         emp2.setFirstName(newName);
>         em.flush();
>Index: jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/tests/jpa/fieldaccess/advanced/EntityManagerTLRJUnitTestSuite.java
>===================================================================
>--- jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/tests/jpa/fieldaccess/advanced/EntityManagerTLRJUnitTestSuite.java	(revision 6703)
>+++ jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/tests/jpa/fieldaccess/advanced/EntityManagerTLRJUnitTestSuite.java	(working copy)
>@@ -495,15 +495,17 @@
>     public void testSetRollbackOnly(){
>         EntityManager em = createEntityManager("fieldaccess");
>         beginTransaction(em);
>+        Employee emp;
>+        Employee emp2;
>         try{
>-            Employee emp = new Employee();
>+            emp = new Employee();
>             emp.setFirstName("Bob");
>             emp.setLastName("Fisher");
>             em.persist(emp);
>-            emp = new Employee();
>-            emp.setFirstName("Anthony");
>-            emp.setLastName("Walace");
>-            em.persist(emp);
>+            emp2 = new Employee();
>+            emp2.setFirstName("Anthony");
>+            emp2.setLastName("Walace");
>+            em.persist(emp2);
>             commitTransaction(em);
>         }catch (RuntimeException ex){
>             if (isTransactionActive(em)){
>@@ -515,10 +517,10 @@
>         clearCache("fieldaccess");
>         em = createEntityManager("fieldaccess");
>         beginTransaction(em);
>-        List result = em.createQuery("SELECT e FROM Employee e").getResultList();
>-        Employee emp = (Employee)result.get(0);
>+        List result = em.createQuery("SELECT e FROM Employee e where e.id = " + emp.getId() + " or e.id = " + emp2.getId()).getResultList();
>+        emp = (Employee)result.get(0);
>         emp.toString();
>-        Employee emp2 = (Employee)result.get(1);
>+        emp2 = (Employee)result.get(1);
>         String newName = ""+System.currentTimeMillis();
>         emp2.setFirstName(newName);
>         em.flush();

Flags:

michael.f.obrien: iplog+

Actions: View | Diff

Attachments on bug 304650: 160912