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

---
 opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ConnectionUtils.java |   19 +++----------------
 1 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ConnectionUtils.java b/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ConnectionUtils.java
index 8498b12..db27b27 100644
--- a/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ConnectionUtils.java
+++ b/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ConnectionUtils.java
@@ -226,12 +226,8 @@
           TrustedSocketFactory.setCurrentThreadTrustManager(fTrustManager,
               fKeyManager);
           pair[0] = new InitialLdapContext(fEnv, null);
-
-        } catch (NamingException ne) {
+        } catch (NamingException | RuntimeException ne) {
           pair[1] = ne;
-
-        } catch (RuntimeException re) {
-          pair[1] = re;
         }
       }
     });
@@ -279,12 +275,8 @@
                 fKeyManager);
           }
           pair[0] = new InitialLdapContext(fEnv, fNewCtls);
-
-        } catch (NamingException ne) {
+        } catch (NamingException | RuntimeException ne) {
           pair[1] = ne;
-
-        } catch (RuntimeException re) {
-          pair[1] = re;
         }
       }
     });
@@ -399,14 +391,9 @@
             result.reconnect(null);
           }
           pair[0] = result;
-
-        } catch (NamingException ne)
+        } catch (NamingException | RuntimeException ne)
         {
           pair[1] = ne;
-
-        } catch (RuntimeException re)
-        {
-          pair[1] = re;
         }
       }
     });

--
Gitblit v1.10.0