From b88a555f5a584c355442ee8db6d218c9fe95fa36 Mon Sep 17 00:00:00 2001
From: Yannick Lecaillez <ylecaillez@forgerock.com>
Date: Tue, 17 Nov 2015 10:16:04 +0000
Subject: [PATCH] OPENDJ-2393: Possible index corruption

---
 opendj-server-legacy/src/main/java/org/opends/server/backends/pdb/PDBStorage.java |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pdb/PDBStorage.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pdb/PDBStorage.java
index d6c6876..8b90b1f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pdb/PDBStorage.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pdb/PDBStorage.java
@@ -184,7 +184,7 @@
       {
         exchange.remove();
       }
-      catch (final PersistitException e)
+      catch (final PersistitException | RollbackException e)
       {
         throw new StorageRuntimeException(e);
       }
@@ -439,7 +439,7 @@
         bytesToValue(ex.getValue(), value);
         ex.store();
       }
-      catch (final Exception e)
+      catch (final PersistitException | RollbackException e)
       {
         throw new StorageRuntimeException(e);
       }
@@ -454,7 +454,7 @@
         bytesToKey(ex.getKey(), key);
         return ex.remove();
       }
-      catch (final PersistitException e)
+      catch (final PersistitException | RollbackException e)
       {
         throw new StorageRuntimeException(e);
       }
@@ -469,7 +469,7 @@
         ex = getExchangeFromCache(treeName);
         ex.removeTree();
       }
-      catch (final PersistitException e)
+      catch (final PersistitException | RollbackException e)
       {
         throw new StorageRuntimeException(e);
       }
@@ -507,7 +507,7 @@
          */
         return new CursorImpl(getNewExchange(treeName, false));
       }
-      catch (final PersistitException e)
+      catch (final PersistitException | RollbackException e)
       {
         throw new StorageRuntimeException(e);
       }
@@ -526,7 +526,7 @@
         {
           getExchangeFromCache(treeName);
         }
-        catch (final PersistitException e)
+        catch (final PersistitException | RollbackException e)
         {
           throw new StorageRuntimeException(e);
         }
@@ -543,7 +543,7 @@
         ex.fetch();
         return valueToBytes(ex.getValue());
       }
-      catch (final PersistitException e)
+      catch (final PersistitException | RollbackException e)
       {
         throw new StorageRuntimeException(e);
       }
@@ -574,7 +574,7 @@
         }
         return false;
       }
-      catch (final Exception e)
+      catch (final PersistitException | RollbackException e)
       {
         throw new StorageRuntimeException(e);
       }
@@ -592,7 +592,7 @@
         put(treeName, dummyKey, ByteString.empty());
         delete(treeName, dummyKey);
       }
-      catch (final PersistitException e)
+      catch (final PersistitException | RollbackException e)
       {
         throw new StorageRuntimeException(e);
       }
@@ -667,7 +667,7 @@
       {
         // ignore missing trees.
       }
-      catch (final PersistitException e)
+      catch (final PersistitException | RollbackException e)
       {
         throw new StorageRuntimeException(e);
       }
@@ -852,7 +852,7 @@
     catch(final InUseException e) {
       throw new StorageInUseException(e);
     }
-    catch (final PersistitException e)
+    catch (final PersistitException | RollbackException e)
     {
       throw new StorageRuntimeException(e);
     }

--
Gitblit v1.10.0