From 4a7170c5a0fe84d1250af96e764200c827f771a0 Mon Sep 17 00:00:00 2001
From: lutoff <lutoff@localhost>
Date: Tue, 24 Jul 2007 07:53:59 +0000
Subject: [PATCH] Fix for issue #2011 (dsframework register-server doesn't add the server into the default all-servers group)
---
opendj-sdk/opends/src/server/org/opends/server/admin/client/cli/DsFrameworkCliServer.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/admin/client/cli/DsFrameworkCliServer.java b/opendj-sdk/opends/src/server/org/opends/server/admin/client/cli/DsFrameworkCliServer.java
index ec4ab37..52df937 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/admin/client/cli/DsFrameworkCliServer.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/admin/client/cli/DsFrameworkCliServer.java
@@ -580,17 +580,18 @@
// -----------------------
if (subCmd.getName().equals(registerServerSubCmd.getName()))
{
+ String serverId ;
Map<ServerProperty, Object> map =
mapSetOptionsToMap(registerServerSetArg);
if (registerServerServerIdArg.isPresent())
{
- map.put(ServerProperty.ID, registerServerServerIdArg.getValue());
+ serverId = registerServerServerIdArg.getValue();
}
else
{
- map.put(ServerProperty.ID, ADSContext
- .getServerIdFromServerProperties(map));
+ serverId = ADSContext.getServerIdFromServerProperties(map);
}
+ map.put(ServerProperty.ID, serverId);
ctx = argParser.getContext(outStream, errStream);
if (ctx == null)
@@ -599,7 +600,10 @@
}
adsCtx = new ADSContext(ctx);
adsCtx.registerServer(map);
- returnCode = ReturnCode.SUCCESSFUL;
+
+ // Add this server in the default "all-servers" group.
+ returnCode = DsFrameworkCliServerGroup.addServerTogroup(adsCtx,
+ ADSContext.ALL_SERVERGROUP_NAME, serverId);
}
else
// -----------------------
--
Gitblit v1.10.0