From defab91e498d4516f715e0523da20004459211c9 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Tue, 26 Jan 2010 00:52:21 +0000
Subject: [PATCH] Fix for issue 4515 (control-panel entry browser does not deal well with sub-suffixes)
---
opends/src/guitools/org/opends/guitools/controlpanel/util/NumSubordinateHacker.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/util/NumSubordinateHacker.java b/opends/src/guitools/org/opends/guitools/controlpanel/util/NumSubordinateHacker.java
index 059e31f..36a2e5e 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/util/NumSubordinateHacker.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/util/NumSubordinateHacker.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2008-2009 Sun Microsystems, Inc.
+ * Copyright 2008-2010 Sun Microsystems, Inc.
*/
package org.opends.guitools.controlpanel.util;
@@ -56,7 +56,7 @@
}
/**
- * Tells wether the list of unreliable contains children of
+ * Tells whether the list of unreliable contains children of
* the entry with LDAPUrl parentUrl.
* @param parentUrl the LDAPURL of the parent.
* @return <CODE>true</CODE> if the list of unreliable entries contains a
@@ -66,9 +66,9 @@
boolean containsChildren = false;
if (!isUnreliableEntryListEmpty) {
- boolean isInServer = serverHost.equals(parentUrl.getHost()) &&
+ boolean isInServer = serverHost.equalsIgnoreCase(
+ String.valueOf(parentUrl.getHost())) &&
(serverPort == parentUrl.getPort());
-
if (isInServer) {
for (DN dn : unreliableEntryList)
{
@@ -92,7 +92,7 @@
}
/**
- * Tells wether the list of unreliable contains the entry with LDAPURL
+ * Tells whether the list of unreliable contains the entry with LDAPURL
* url.
* It assumes that we previously called containsChildrenOf (there's no check
* of the host/port).
@@ -103,9 +103,9 @@
public boolean contains(LDAPURL url) {
boolean contains = false;
if (!isUnreliableEntryListEmpty) {
- boolean isInServer = serverHost.equals(url.getHost()) &&
+ boolean isInServer =
+ serverHost.equalsIgnoreCase(String.valueOf(url.getHost())) &&
(serverPort == url.getPort());
-
if (isInServer) {
for (DN dn : unreliableEntryList)
{
--
Gitblit v1.10.0