Fix for issue #2011 (dsframework register-server doesn't add the server int...

lutoff

24.53.2007 4a7170c5a0fe84d1250af96e764200c827f771a0

 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
      // -----------------------