Fix for #7186 - it is now possible to continue using the SQLContainer after an OptimisticLockException after first doing a rollback()

svn changeset:20844/svn branch:6.7

1 files changed, 24 insertions, 0 deletions

diff --git a/src/com/vaadin/data/util/sqlcontainer/SQLContainer.java b/src/com/vaadin/data/util/sqlcontainer/SQLContainer.java
index 8d00d6f495..f25252b8c0 100644
--- a/src/com/vaadin/data/util/sqlcontainer/SQLContainer.java
+++ b/src/com/vaadin/data/util/sqlcontainer/SQLContainer.java
@@ -414,6 +414,17 @@ public class SQLContainer implements Container, Container.Filterable,
                             ee);
                 }
                 return false;
+            } catch (OptimisticLockException e) {
+                logger.log(Level.WARNING, "Failed to remove row, rolling back",
+                        e);
+                try {
+                    delegate.rollback();
+                } catch (SQLException ee) {
+                    /* Nothing can be done here */
+                    logger.log(Level.SEVERE, "Failed to rollback row removal",
+                            ee);
+                }
+                throw e;
             }
         } else {
             removedItems.put((RowId) itemId, (RowItem) getItem(itemId));
@@ -460,6 +471,16 @@ public class SQLContainer implements Container, Container.Filterable,
                     logger.log(Level.SEVERE, "Failed to roll back", ee);
                 }
                 return false;
+            } catch (OptimisticLockException e) {
+                logger.log(Level.WARNING,
+                        "removeAllItems() failed, rolling back", e);
+                try {
+                    delegate.rollback();
+                } catch (SQLException ee) {
+                    /* Nothing can be done here */
+                    logger.log(Level.SEVERE, "Failed to roll back", ee);
+                }
+                throw e;
             }
         } else {
             for (Object id : getItemIds()) {
@@ -891,6 +912,9 @@ public class SQLContainer implements Container, Container.Filterable,
         } catch (SQLException e) {
             delegate.rollback();
             throw e;
+        } catch (OptimisticLockException e) {
+            delegate.rollback();
+            throw e;
         }
     }