From d24cd9dbc64c0a85f7d4178eadadc1d5cb4f6c44 Mon Sep 17 00:00:00 2001
From: lutoff <lutoff@localhost>
Date: Mon, 12 Jan 2009 09:59:37 +0000
Subject: [PATCH] Fix for issue #2829 (Problems configuring and unconfiguring replication servers) scenario: 1) configure and start 2 servers s1 and s2 2) enable the replication between them 3) disable replication on server s1 4) disable replication on server s2 5) re-enable the replication between them
---
opends/src/ads/org/opends/admin/ads/ADSContextHelper.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/opends/src/ads/org/opends/admin/ads/ADSContextHelper.java b/opends/src/ads/org/opends/admin/ads/ADSContextHelper.java
index cb788e9..0caafed 100644
--- a/opends/src/ads/org/opends/admin/ads/ADSContextHelper.java
+++ b/opends/src/ads/org/opends/admin/ads/ADSContextHelper.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2007-2008 Sun Microsystems, Inc.
+ * Copyright 2007-2009 Sun Microsystems, Inc.
*/
package org.opends.admin.ads;
@@ -268,11 +268,14 @@
ctx.createSubcontext(keyDn, keyAttrs).close();
}
- /* associate server entry with certificate entry via key ID attribute */
- ctx.modifyAttributes(serverEntryDn,
+ if (serverEntryDn != null)
+ {
+ /* associate server entry with certificate entry via key ID attribute */
+ ctx.modifyAttributes(serverEntryDn,
InitialLdapContext.REPLACE_ATTRIBUTE,
(new BasicAttributes(
ServerProperty.INSTANCE_KEY_ID.getAttributeName(), keyID)));
+ }
}
catch (NamingException ne)
{
--
Gitblit v1.10.0