From 8cd8d8c556fe831484f7d3f42d6db8184515d7ad Mon Sep 17 00:00:00 2001
From: lutoff <lutoff@localhost>
Date: Fri, 31 Aug 2007 12:51:26 +0000
Subject: [PATCH] Fix for issue #2202 (NPE in unregister-server when no server group membership)
---
opends/src/server/org/opends/server/admin/client/cli/DsFrameworkCliServer.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/opends/src/server/org/opends/server/admin/client/cli/DsFrameworkCliServer.java b/opends/src/server/org/opends/server/admin/client/cli/DsFrameworkCliServer.java
index 3f9ee00..87b584a 100644
--- a/opends/src/server/org/opends/server/admin/client/cli/DsFrameworkCliServer.java
+++ b/opends/src/server/org/opends/server/admin/client/cli/DsFrameworkCliServer.java
@@ -650,10 +650,13 @@
throw new ADSContextException (ErrorType.NOT_YET_REGISTERED) ;
}
Set groupList = (Set) serverProperties.get(ServerProperty.GROUPS);
- for (Object groupId : groupList.toArray())
+ if (groupList != null)
{
- DsFrameworkCliServerGroup.removeServerFromGroup(adsCtx,
- (String) groupId, serverId);
+ for (Object groupId : groupList.toArray())
+ {
+ DsFrameworkCliServerGroup.removeServerFromGroup(adsCtx,
+ (String) groupId, serverId);
+ }
}
// unregister the server
--
Gitblit v1.10.0