From cbfb986e90545c1d5b3508ba3c06d7d59fe7ad40 Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Thu, 04 Aug 2011 16:16:48 +0000
Subject: [PATCH] Fix OPENDJ-252. Control Panel fails with a Null Pointer Exception with JDK7. Thanks to jvergara who provided a quick fix to OpenDS.
---
opends/src/guitools/org/opends/guitools/controlpanel/util/ConfigFromDirContext.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/util/ConfigFromDirContext.java b/opends/src/guitools/org/opends/guitools/controlpanel/util/ConfigFromDirContext.java
index 9bde4e1..0b64817 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/util/ConfigFromDirContext.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/util/ConfigFromDirContext.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2008-2010 Sun Microsystems, Inc.
+ * Copyright 2008-2011 Sun Microsystems, Inc.
*/
package org.opends.guitools.controlpanel.util;
@@ -310,7 +310,7 @@
try
{
BackendCfgClient backend = root.getBackend(backendNames[i]);
- SortedSet<BaseDNDescriptor> baseDNs = new TreeSet<BaseDNDescriptor>();
+ Set<BaseDNDescriptor> baseDNs = new HashSet<BaseDNDescriptor>();
for (DN dn : backend.getBaseDN())
{
BaseDNDescriptor baseDN =
@@ -318,9 +318,9 @@
null, -1, -1, -1);
baseDNs.add(baseDN);
}
- SortedSet<IndexDescriptor> indexes = new TreeSet<IndexDescriptor>();
- SortedSet<VLVIndexDescriptor> vlvIndexes =
- new TreeSet<VLVIndexDescriptor>();
+ Set<IndexDescriptor> indexes = new HashSet<IndexDescriptor>();
+ Set<VLVIndexDescriptor> vlvIndexes =
+ new HashSet<VLVIndexDescriptor>();
BackendDescriptor.Type type;
if (backend instanceof LocalDBBackendCfgClient)
{
--
Gitblit v1.10.0