From b585833c0c69866d50fbc8edb441ae2364a50df6 Mon Sep 17 00:00:00 2001
From: Catalina Wei <fancy@apache.org>
Date: Thu, 8 May 2008 21:31:31 +0000
Subject: [PATCH] OPENJPA-574 DataCache entries not evicted when multiple
 OptimisticLockExceptions reported from backend DB.

git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@654631 13f79535-47bb-0310-9956-ffa450edef68
---
 .../jdbc/kernel/BatchingPreparedStatementManagerImpl.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/BatchingPreparedStatementManagerImpl.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/BatchingPreparedStatementManagerImpl.java
index 28c1ea51b..56935a11e 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/BatchingPreparedStatementManagerImpl.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/BatchingPreparedStatementManagerImpl.java
@@ -241,9 +241,9 @@ public class BatchingPreparedStatementManagerImpl extends
                 break;
             case 0: // no row is inserted, treats it as failed
                 // case
-                if (failed != null || row.getAction() == Row.ACTION_UPDATE)
+                if (failed != null)
                     _exceptions.add(new OptimisticException(failed));
-                else
+                else if (row.getAction() == Row.ACTION_INSERT)
                     throw new SQLException(_loc.get(
                         "update-failed-no-failed-obj",
                         String.valueOf(count[i]), _batchedSql).getMessage());