From 0569f3093648f7456aace953abc0e8a67fc8ec89 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 25 Nov 2016 14:50:11 +0000
Subject: [PATCH] ConfigurationHandler.java: Pushed the whole if inside the try/catch

---
 opendj-server-legacy/src/main/java/org/opends/server/config/ConfigurationHandler.java |   22 ++++++++--------------
 1 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/server/config/ConfigurationHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/config/ConfigurationHandler.java
index a004ec2..6517cc8 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/config/ConfigurationHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/config/ConfigurationHandler.java
@@ -1456,9 +1456,10 @@
         continue;
       }
       int dashPos = name.indexOf('-', 7);
-      if (dashPos < 0)
+
+      try
       {
-        try
+        if (dashPos < 0)
         {
           ByteString ts = ByteString.valueOfUtf8(name.substring(7, dotPos));
           long timestamp = GeneralizedTimeSyntax.decodeGeneralizedTimeValue(ts);
@@ -1469,14 +1470,7 @@
             latestCounter = 0;
           }
         }
-        catch (Exception e)
-        {
-          // Ignore.
-        }
-      }
-      else
-      {
-        try
+        else
         {
           ByteString ts = ByteString.valueOfUtf8(name.substring(7, dashPos));
           long timestamp = GeneralizedTimeSyntax.decodeGeneralizedTimeValue(ts);
@@ -1490,10 +1484,10 @@
             latestCounter = counter;
           }
         }
-        catch (Exception e)
-        {
-          // Ignore.
-        }
+      }
+      catch (Exception ignored)
+      {
+        // Ignore.
       }
     }
 

--
Gitblit v1.10.0