From d3e64655c9ebfefffbe641d58eeacdd8a8fb72dd Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 17 Aug 2015 08:21:47 +0000
Subject: [PATCH] Code improvements

---
 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/VerifyJob.java |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/VerifyJob.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/VerifyJob.java
index a8619ef..f16d960 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/VerifyJob.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/VerifyJob.java
@@ -28,6 +28,7 @@
 
 import static org.opends.messages.BackendMessages.*;
 import static org.opends.server.backends.pluggable.DnKeyFormat.*;
+import static org.opends.server.backends.pluggable.SuffixContainer.*;
 import static org.opends.server.backends.pluggable.VLVIndex.*;
 import static org.opends.server.util.StaticUtils.*;
 
@@ -192,11 +193,11 @@
         for (String index : list)
         {
           String lowerName = index.toLowerCase();
-          if ("dn2id".equals(lowerName))
+          if (DN2ID_INDEX_NAME.equals(lowerName))
           {
             verifyDN2ID = true;
           }
-          else if ("id2childrencount".equals(lowerName))
+          else if (ID2CHILDREN_COUNT_NAME.equals(lowerName))
           {
             verifyID2ChildrenCount = true;
           }
@@ -207,10 +208,11 @@
               throw new StorageRuntimeException(ERR_VLV_INDEX_NOT_CONFIGURED.get(lowerName).toString());
             }
 
-            VLVIndex vlvIndex = entryContainer.getVLVIndex(lowerName.substring(4));
+            String vlvIndexName = lowerName.substring(4);
+            VLVIndex vlvIndex = entryContainer.getVLVIndex(vlvIndexName);
             if(vlvIndex == null)
             {
-              throw new StorageRuntimeException(ERR_VLV_INDEX_NOT_CONFIGURED.get(lowerName.substring(4)).toString());
+              throw new StorageRuntimeException(ERR_VLV_INDEX_NOT_CONFIGURED.get(vlvIndexName).toString());
             }
 
             vlvIndexList.add(vlvIndex);

--
Gitblit v1.10.0