From f4eb1c336ec220e6605e7b90204cbb91a68b60eb Mon Sep 17 00:00:00 2001
From: lutoff <lutoff@localhost>
Date: Tue, 24 Jul 2007 14:13:28 +0000
Subject: [PATCH] Fix for issue #2013 (dsframework unregister-server doesn't update groups which contain this server)
---
opends/src/server/org/opends/server/admin/client/cli/DsFrameworkCliServerGroup.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/opends/src/server/org/opends/server/admin/client/cli/DsFrameworkCliServerGroup.java b/opends/src/server/org/opends/server/admin/client/cli/DsFrameworkCliServerGroup.java
index 2672608..b6b7920 100644
--- a/opends/src/server/org/opends/server/admin/client/cli/DsFrameworkCliServerGroup.java
+++ b/opends/src/server/org/opends/server/admin/client/cli/DsFrameworkCliServerGroup.java
@@ -47,6 +47,7 @@
import org.opends.admin.ads.ADSContextException;
import org.opends.admin.ads.ADSContext.ServerGroupProperty;
import org.opends.admin.ads.ADSContext.ServerProperty;
+import org.opends.admin.ads.ADSContextException.ErrorType;
import org.opends.server.admin.client.cli.DsFrameworkCliReturnCode.ReturnCode;
import org.opends.server.util.args.ArgumentException;
import org.opends.server.util.args.BooleanArgument;
@@ -742,7 +743,7 @@
}
if ( !found )
{
- return ReturnCode.SERVER_NOT_REGISTERED;
+ throw new ADSContextException (ErrorType.NOT_YET_REGISTERED) ;
}
// Add the server inside the group
@@ -798,7 +799,7 @@
{
}
- return ReturnCode.SUCCESSFUL;
+ returnCode = ReturnCode.SUCCESSFUL;
}
// -----------------------
// list-membership subcommand
@@ -908,7 +909,7 @@
* If there is a problem with any of the parameters used
* to create this argument.
*/
- private ReturnCode removeServerFromGroup(ADSContext adsCtx, String groupId,
+ static ReturnCode removeServerFromGroup(ADSContext adsCtx, String groupId,
String serverId)
throws ADSContextException
{
--
Gitblit v1.10.0