From a8f5d8345278d27ddf5325d3977e460b86b6275f Mon Sep 17 00:00:00 2001
From: ludovicp <ludovicp@localhost>
Date: Tue, 27 Apr 2010 20:56:50 +0000
Subject: [PATCH] Fixing several issues with the Control Panel, the QuickSetup, Core server and Replication. Also improves unit, functional tests. More specifically this commit resolves the following open issues: 4385 - NPE when using ExtensibleMatch filter without a matching rule 4521 - dynamic lookup in attribut selection when selecting the sort order attribut while defining VLV index 4531 - Control Panel creates virtual static groups using groupOfURLs as objectclass 4533 - NullPointerException when configuring replication between 2 OpenDS 4539 - DSML Gateway - jaxb.properties Exception
---
opends/src/server/org/opends/server/tools/EncodePassword.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/opends/src/server/org/opends/server/tools/EncodePassword.java b/opends/src/server/org/opends/server/tools/EncodePassword.java
index 07a0d47..ff89902 100644
--- a/opends/src/server/org/opends/server/tools/EncodePassword.java
+++ b/opends/src/server/org/opends/server/tools/EncodePassword.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2006-2009 Sun Microsystems, Inc.
+ * Copyright 2006-2010 Sun Microsystems, Inc.
*/
package org.opends.server.tools;
@@ -535,7 +535,7 @@
int size = storageSchemes.size();
ArrayList<String> nameList = new ArrayList<String>(size);
- for (PasswordStorageScheme s : storageSchemes.values())
+ for (PasswordStorageScheme<?> s : storageSchemes.values())
{
nameList.add(s.getAuthPasswordSchemeName());
}
@@ -566,7 +566,7 @@
int size = storageSchemes.size();
ArrayList<String> nameList = new ArrayList<String>(size);
- for (PasswordStorageScheme s : storageSchemes.values())
+ for (PasswordStorageScheme<?> s : storageSchemes.values())
{
nameList.add(s.getStorageSchemeName());
}
@@ -622,7 +622,7 @@
return 1;
}
- PasswordStorageScheme storageScheme =
+ PasswordStorageScheme<?> storageScheme =
DirectoryServer.getAuthPasswordStorageScheme(scheme);
if (storageScheme == null)
{
@@ -672,7 +672,7 @@
}
else
{
- PasswordStorageScheme storageScheme;
+ PasswordStorageScheme<?> storageScheme;
String encodedPWString;
if (UserPasswordSyntax.isEncoded(encodedPW))
@@ -772,7 +772,7 @@
else
{
// Try to get a reference to the requested password storage scheme.
- PasswordStorageScheme storageScheme;
+ PasswordStorageScheme<?> storageScheme;
if (authPasswordSyntax.isPresent())
{
String scheme = schemeName.getValue();
@@ -912,7 +912,7 @@
//Initialize PWD policy components.
directoryServer.initializePasswordPolicyComponents();
//Load the crypto-manager key cache among other things.
- new CryptoManagerSync();
+ new CryptoManagerSync(false);
} catch (InitializationException ie) {
Message message = ERR_ENCPW_CANNOT_INITIALIZE_SERVER_COMPONENTS.get(
getExceptionMessage(ie));
@@ -955,7 +955,7 @@
backendCfg instanceof LDIFBackendCfg) {
if(backendCfg.isEnabled()) {
String className = backendCfg.getJavaClass();
- Class backendClass;
+ Class<?> backendClass;
Backend backend;
try {
backendClass = DirectoryServer.loadClass(className);
@@ -1181,7 +1181,7 @@
try
{
// attempt masking at this rate
- this.sleep(1);
+ ErasingThread.sleep(1);
}
catch (InterruptedException iex)
{
--
Gitblit v1.10.0