You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by fa...@apache.org on 2008/06/13 02:23:56 UTC

svn commit: r667302 - in /openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel: BatchingConstraintUpdateManager.java BatchingOperationOrderUpdateManager.java

Author: fancy
Date: Thu Jun 12 17:23:56 2008
New Revision: 667302

URL: http://svn.apache.org/viewvc?rev=667302&view=rev
Log:
OPENJPA-634 Batched updates resulted in SQLException was not propagated back to users application
fix OutOfMemoryException

Modified:
    openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/BatchingConstraintUpdateManager.java
    openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/BatchingOperationOrderUpdateManager.java

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/BatchingConstraintUpdateManager.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/BatchingConstraintUpdateManager.java?rev=667302&r1=667301&r2=667302&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/BatchingConstraintUpdateManager.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/BatchingConstraintUpdateManager.java Thu Jun 12 17:23:56 2008
@@ -67,13 +67,6 @@
             exceps = addException(exceps, ke);
         }
 
-        // return all exceptions
-        Collection psExceps = psMgr.getExceptions();
-        if (exceps == null)
-            return psExceps;
-        if (psExceps == null)
-            return exceps;
-        exceps.addAll(psExceps);
         return exceps;
     }
 }

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/BatchingOperationOrderUpdateManager.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/BatchingOperationOrderUpdateManager.java?rev=667302&r1=667301&r2=667302&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/BatchingOperationOrderUpdateManager.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/BatchingOperationOrderUpdateManager.java Thu Jun 12 17:23:56 2008
@@ -69,13 +69,6 @@
             exceps = addException(exceps, ke);
         }
 
-        // return all exceptions
-        Collection psExceps = psMgr.getExceptions();
-        if (exceps == null)
-            return psExceps;
-        if (psExceps == null)
-            return exceps;
-        exceps.addAll(psExceps);
         return exceps;
     }
 }