Author: ito
Date: Fri Dec 3 11:51:04 2010
New Revision: 1041777
URL: http://svn.apache.org/viewvc?rev=1041777&view=rev
Log:
CLEREZZA-369: user first deleted in systemgraph then the contentgraph is checked
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/java/org/apache/clerezza/platform/usermanager/webinterface/UserManagerWeb.java
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/java/org/apache/clerezza/platform/usermanager/webinterface/UserManagerWeb.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/java/org/apache/clerezza/platform/usermanager/webinterface/UserManagerWeb.java?rev=1041777&r1=1041776&r2=1041777&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/java/org/apache/clerezza/platform/usermanager/webinterface/UserManagerWeb.java
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/java/org/apache/clerezza/platform/usermanager/webinterface/UserManagerWeb.java
Fri Dec 3 11:51:04 2010
@@ -501,6 +501,7 @@ public class UserManagerWeb implements G
@Context UriInfo uriInfo) {
checkUserParam(userName);
+ userManager.deleteUser(userName);
LockableMGraph contentGraph = (LockableMGraph)
cgProvider.getContentGraph();
NonLiteral user = getCustomUser(contentGraph, userName);
if (user != null) {
@@ -514,12 +515,9 @@ public class UserManagerWeb implements G
}
} finally {
writeLock.unlock();
- }
- userManager.deleteUser(userName);
- return
RedirectUtil.createSeeOtherResponse("list-users", uriInfo);
+ }
}
- return Response.status(Status.NOT_FOUND).entity(
- "User " + userName + "does not exist in our
database").build();
+ return RedirectUtil.createSeeOtherResponse("list-users",
uriInfo);
}
private void checkUserParam(String userName) {
