From a3c93828f847345ed67fda0cddf1089d8fb433d5 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 07 Mar 2016 15:04:03 +0000
Subject: [PATCH] OPENDJ-1342 Migrate AVA, RDN, and DN classes: DirectoryException => LocalizedIllegalArgumentException
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/VLVIndexPanel.java | 17 +++++------------
1 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/VLVIndexPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/VLVIndexPanel.java
index 851d66e..75b654a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/VLVIndexPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/VLVIndexPanel.java
@@ -49,6 +49,7 @@
import javax.swing.event.ListDataListener;
import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.LocalizedIllegalArgumentException;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.ldap.SearchScope;
@@ -519,7 +520,7 @@
return !index.getBaseDN().equals(DN.valueOf(getBaseDN())) || !index.getScope().equals(getScope())
|| !index.getFilter().equals(filter.getText().trim()) || !index.getSortOrder().equals(getSortOrder());
}
- catch (final OpenDsException odse)
+ catch (final LocalizedIllegalArgumentException unused)
{
// The base DN is not valid. This means that the index has been modified.
return true;
@@ -776,18 +777,10 @@
args.add("--index-name");
args.add(indexName);
- try
+ if (!indexToModify.getBaseDN().equals(DN.valueOf(baseDN)))
{
- final DN b = DN.valueOf(baseDN);
- if (!indexToModify.getBaseDN().equals(b))
- {
- args.add("--set");
- args.add("base-dn:" + baseDN);
- }
- }
- catch (final OpenDsException odse)
- {
- throw new RuntimeException("Unexpected error parsing DN " + getBaseDN() + ": " + odse, odse);
+ args.add("--set");
+ args.add("base-dn:" + baseDN);
}
if (indexToModify.getScope() != searchScope)
--
Gitblit v1.10.0