--- a/artifact-database/src/main/java/de/intevation/artifactdatabase/ArtifactDatabaseImpl.java	Thu Mar 03 09:53:02 2011 +0000
+++ b/artifact-database/src/main/java/de/intevation/artifactdatabase/ArtifactDatabaseImpl.java	Thu Mar 03 10:33:49 2011 +0000
@@ -971,7 +971,7 @@
             throw new ArtifactDatabaseException(NO_SUCH_FACTORY);
         }
 
-        User[] users = factory.getUsers(context);
+        User [] users = backend.getUsers(factory, context);
 
         if (users != null) {
             logger.debug(users.length + " users found in the backend.");
@@ -1022,7 +1022,7 @@
         User newUser = null;
 
         try {
-            newUser = factory.createUser(name, role, context);
+            newUser = backend.createUser(name, role, userFactory, context);
         }
         catch (Exception e) {
             logger.error(e.getMessage(), e);
@@ -1053,12 +1053,6 @@
     public Document deleteUser(String userId, CallMeta callMeta)
         throws ArtifactDatabaseException
     {
-        UserFactory factory = getUserFactory();
-
-        if (factory == null) {
-            throw new ArtifactDatabaseException(NO_SUCH_FACTORY);
-        }
-
         logger.debug("Delete user: " + userId);
 
         Document result = XMLUtils.newDocument();
@@ -1071,7 +1065,7 @@
         Element root = ec.create("result");
         result.appendChild(root);
 
-        boolean success = factory.deleteUser(userId, context);
+        boolean success = backend.deleteUser(userId);
 
         root.setTextContent(success ? OPERATION_SUCCESSFUL: OPERATION_FAILURE);