From ca8222868cc9467a49dea172db7f0ac80d94faff Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Wed, 13 Jan 2010 01:54:09 +0000
Subject: [PATCH] Fix for issue 4484 (Follow Referrals functionality is broken). The code was not complete. Fix some issues in different areas.
---
opends/src/guitools/org/opends/guitools/controlpanel/browser/BrowserController.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/browser/BrowserController.java b/opends/src/guitools/org/opends/guitools/controlpanel/browser/BrowserController.java
index 46cbd87..d2c2f54 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/browser/BrowserController.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/browser/BrowserController.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.browser;
@@ -1148,7 +1148,8 @@
boolean isConfigurationNode)
throws NamingException {
InitialLdapContext result;
- if (followReferrals && (node.getRemoteUrl() != null)) {
+ if (followReferrals && (node.getRemoteUrl() != null))
+ {
result = connectionPool.getConnection(node.getRemoteUrl());
}
else {
@@ -1676,7 +1677,7 @@
// Note: logically we should unconditionaly call:
// startRefreshNode(child, false, true);
//
- // However doing that saturates _refreshQueue
+ // However doing that saturates refreshQueue
// with many nodes. And, by design, RefreshTask
// won't do anything on a node if:
// - this node has no subordinates
@@ -2080,7 +2081,8 @@
{
String[] result = null;
Set<String> values = ConnectionUtils.getValues(entry, "objectClass");
- if (values != null) {
+ if (values != null)
+ {
for (String value : values)
{
boolean isReferral = value.equalsIgnoreCase("referral");
@@ -2091,10 +2093,9 @@
{
result = new String[refValues.size()];
refValues.toArray(result);
- break;
}
+ break;
}
- break;
}
}
return result;
--
Gitblit v1.10.0