From 3f5a20d71b7962b94365c5f6e1b0fba8b907ba14 Mon Sep 17 00:00:00 2001 From: Adrian Damian <Adrian.Damian@nrc-cnrc.gc.ca> Date: Thu, 25 Sep 2014 14:41:31 -0700 Subject: [PATCH] Fixed deleteAction log --- .../src/ca/nrc/cadc/ac/server/web/DeleteGroupAction.java | 8 +++----- .../src/ca/nrc/cadc/ac/client/GMSClient.java | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/DeleteGroupAction.java b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/DeleteGroupAction.java index 88504632..8f619fa3 100755 --- a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/DeleteGroupAction.java +++ b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/DeleteGroupAction.java @@ -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()); diff --git a/projects/cadcAccessControl/src/ca/nrc/cadc/ac/client/GMSClient.java b/projects/cadcAccessControl/src/ca/nrc/cadc/ac/client/GMSClient.java index 00af7387..f7d86888 100755 --- a/projects/cadcAccessControl/src/ca/nrc/cadc/ac/client/GMSClient.java +++ b/projects/cadcAccessControl/src/ca/nrc/cadc/ac/client/GMSClient.java @@ -410,7 +410,7 @@ public class GMSClient { throw new GroupNotFoundException(errMessage); } - throw new IOException(errMessage); + throw new IOException("HttpResponse (" + responseCode + ") - " + errMessage); } } -- GitLab