Commit 6a0360e0 authored by Brian Major's avatar Brian Major
Browse files

Merge branch 's1651' of /usr/cadc/dev/git/wopencadc into s1651

parents 12fa9c52 6fa062bd
Loading
Loading
Loading
Loading
+3 −5
Original line number Diff line number Diff line
@@ -68,13 +68,11 @@
 */
package ca.nrc.cadc.ac.server.web;

import java.util.ArrayList;

import ca.nrc.cadc.ac.Group;
import ca.nrc.cadc.ac.User;
import ca.nrc.cadc.ac.server.GroupPersistence;
import java.security.Principal;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;

public class DeleteGroupAction extends GroupsAction
{
@@ -94,7 +92,7 @@ public class DeleteGroupAction extends GroupsAction
        groupPersistence.deleteGroup(this.groupName);
        if ((deletedGroup.getUserMembers().size() > 0) || (deletedGroup.getGroupMembers().size() > 0))
        {
            this.logInfo.addedMembers = new ArrayList<String>();
            this.logInfo.deletedMembers = new ArrayList<String>();
            for (Group gr : deletedGroup.getGroupMembers())
            {
                this.logInfo.deletedMembers.add(gr.getID());
+1 −1
Original line number Diff line number Diff line
@@ -410,7 +410,7 @@ public class GMSClient
            {
                throw new GroupNotFoundException(errMessage);
            }
            throw new IOException(errMessage);
            throw new IOException("HttpResponse (" + responseCode + ") - " + errMessage);
        }
    }