You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by eg...@apache.org on 2003/06/10 15:59:25 UTC
cvs commit: cocoon-lenya/src/java/org/apache/lenya/cms/cocoon/acting UserAdminDeleteAction.java
egli 2003/06/10 06:59:25
Modified: src/java/org/apache/lenya/cms/cocoon/acting
UserAdminDeleteAction.java
Log:
Handle the case where the request tries to delete a non-existing
user.
Revision Changes Path
1.4 +9 -3 cocoon-lenya/src/java/org/apache/lenya/cms/cocoon/acting/UserAdminDeleteAction.java
Index: UserAdminDeleteAction.java
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/cocoon/acting/UserAdminDeleteAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- UserAdminDeleteAction.java 6 Jun 2003 17:59:23 -0000 1.3
+++ UserAdminDeleteAction.java 10 Jun 2003 13:59:25 -0000 1.4
@@ -85,7 +85,8 @@
throws Exception {
Request request = ObjectModelHelper.getRequest(objectModel);
- Publication publication = PublicationFactory.getPublication(objectModel);
+ Publication publication =
+ PublicationFactory.getPublication(objectModel);
Map emptyMap = Collections.EMPTY_MAP;
@@ -99,7 +100,12 @@
return null;
}
User user = manager.getUser(userId);
-
+
+ if (user == null) {
+ getLogger().warn("Trying to delete non-existing user: " + userId);
+ return null;
+ }
+
try {
user.delete();
} catch (AccessControlException e) {
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org