From 58e42cdaa28e32c1225deda4cfeab261d7156496 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 18 May 2015 21:52:13 +0000
Subject: [PATCH] AutoRefactor'ed Use multi-catch

---
 opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/EntryContainer.java |   56 ++++++++------------------------------------------------
 1 files changed, 8 insertions(+), 48 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/EntryContainer.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/EntryContainer.java
index e463069..d7fdf3e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/EntryContainer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/EntryContainer.java
@@ -1522,20 +1522,10 @@
         entryCache.putEntry(entry, backend, entryID.longValue());
       }
     }
-    catch (DatabaseException databaseException)
+    catch (DatabaseException | DirectoryException | CanceledOperationException e)
     {
       EntryContainer.transactionAbort(txn);
-      throw databaseException;
-    }
-    catch (DirectoryException directoryException)
-    {
-      EntryContainer.transactionAbort(txn);
-      throw directoryException;
-    }
-    catch (CanceledOperationException coe)
-    {
-      EntryContainer.transactionAbort(txn);
-      throw coe;
+      throw e;
     }
     catch (Exception e)
     {
@@ -1711,20 +1701,10 @@
                 subordinateEntriesDeleted + 1));
       }
     }
-    catch (DatabaseException databaseException)
+    catch (DatabaseException | DirectoryException | CanceledOperationException e)
     {
       EntryContainer.transactionAbort(txn);
-      throw databaseException;
-    }
-    catch (DirectoryException directoryException)
-    {
-      EntryContainer.transactionAbort(txn);
-      throw directoryException;
-    }
-    catch (CanceledOperationException coe)
-    {
-      EntryContainer.transactionAbort(txn);
-      throw coe;
+      throw e;
     }
     catch (Exception e)
     {
@@ -1995,20 +1975,10 @@
         entryCache.putEntry(newEntry, backend, entryID.longValue());
       }
     }
-    catch (DatabaseException databaseException)
+    catch (DatabaseException | DirectoryException | CanceledOperationException e)
     {
       EntryContainer.transactionAbort(txn);
-      throw databaseException;
-    }
-    catch (DirectoryException directoryException)
-    {
-      EntryContainer.transactionAbort(txn);
-      throw directoryException;
-    }
-    catch (CanceledOperationException coe)
-    {
-      EntryContainer.transactionAbort(txn);
-      throw coe;
+      throw e;
     }
     catch (Exception e)
     {
@@ -2261,20 +2231,10 @@
       // Commit the transaction.
       EntryContainer.transactionCommit(txn);
     }
-    catch (DatabaseException databaseException)
+    catch (DatabaseException | DirectoryException | CanceledOperationException e)
     {
       EntryContainer.transactionAbort(txn);
-      throw databaseException;
-    }
-    catch (DirectoryException directoryException)
-    {
-      EntryContainer.transactionAbort(txn);
-      throw directoryException;
-    }
-    catch (CanceledOperationException coe)
-    {
-      EntryContainer.transactionAbort(txn);
-      throw coe;
+      throw e;
     }
     catch (Exception e)
     {

--
Gitblit v1.10.0