Fix for issue 3826 (Exception in control panel LDAP browser)

jvergara

24.58.2009 884a71db1ce4fe92007216b306405bd629835bc7

 opends/src/guitools/org/opends/guitools/controlpanel/ui/AbstractBrowseEntriesPanel.java

@@ -664,6 +664,7 @@
    setPrimaryValid(lFilter);
    String s = getBaseDN();
    boolean displayAll = false;
    DN theDN = null;
    if (s != null)
    {
      displayAll = s.equals(ALL_BASE_DNS);
@@ -671,7 +672,7 @@
      {
        try
        {
          DN.decode(s);
          theDN = DN.decode(s);
        }
        catch (Throwable t)
        {
@@ -712,6 +713,10 @@
        {
          for (BaseDNDescriptor baseDN : backend.getBaseDns())
          {
            if ((theDN != null) && baseDN.getDn().equals(theDN))
            {
              isBaseDN = true;
            }
            String dn = Utilities.unescapeUtf8(baseDN.getDn().toString());
            if (displayAll)
            {
@@ -720,7 +725,6 @@
            else if (s.equals(dn))
            {
              controller.addSuffix(dn, null);
              isBaseDN = true;
            }
          }
        }
@@ -1331,16 +1335,22 @@
                }
                if (baseDN.getEntries() > 0)
                {
                  if (!controller.hasSuffix(dn))
                  try
                  {
                    if (displayAll)
                    if (!controller.hasSuffix(dn))
                    {
                      controller.addSuffix(dn, null);
                      if (displayAll || isBaseDN)
                      {
                        controller.addSuffix(dn, null);
                      }
                    }
                    else if (s.equals(dn))
                    {
                      controller.addSuffix(dn, null);
                    }
                  }
                  catch (IllegalArgumentException iae)
                  {
                    // The suffix node exists but is not a suffix node.
                    // Simply log a message.
                    LOG.log(Level.WARNING, "Suffix: "+dn+
                        " added as a non suffix node. Exception: "+iae, iae);
                  }
                }
              }