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/crypto/CryptoManagerSync.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/opends/src/server/org/opends/server/crypto/CryptoManagerSync.java b/opends/src/server/org/opends/server/crypto/CryptoManagerSync.java
index 4bd43ef..e183408 100644
--- a/opends/src/server/org/opends/server/crypto/CryptoManagerSync.java
+++ b/opends/src/server/org/opends/server/crypto/CryptoManagerSync.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2008 Sun Microsystems, Inc.
+ * Copyright 2008-2010 Sun Microsystems, Inc.
*/
package org.opends.server.crypto;
@@ -123,8 +123,26 @@
public CryptoManagerSync()
throws InitializationException
{
+ this(true);
+ }
+
+ /**
+ * Creates a new instance of this trust store synchronization thread.
+ *
+ * @param publishInstanceKey whether the instance key must be published in
+ * the ADS or not.
+ * @throws InitializationException in case an exception occurs during
+ * initialization, such as a failure to publish the instance-key-pair
+ * public-key-certificate in ADS.
+ */
+ public CryptoManagerSync(boolean publishInstanceKey)
+ throws InitializationException
+ {
try {
- CryptoManagerImpl.publishInstanceKeyEntryInADS();
+ if (publishInstanceKey)
+ {
+ CryptoManagerImpl.publishInstanceKeyEntryInADS();
+ }
}
catch (CryptoManagerException ex) {
throw new InitializationException(ex.getMessageObject());
--
Gitblit v1.10.0