From 781c294599f7e3d2cfd01fb0deeb8a39b7a32850 Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Fri, 23 Nov 2012 09:29:18 +0000
Subject: return updated user and un comment tested code
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-core/trunk@1412794 13f79535-47bb-0310-9956-ffa450edef68
---
.../archiva/redback/users/jdo/JdoUserManager.java | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
(limited to 'redback-users')
diff --git a/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/apache/archiva/redback/users/jdo/JdoUserManager.java b/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/apache/archiva/redback/users/jdo/JdoUserManager.java
index 80c36db50..c5513921b 100644
--- a/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/apache/archiva/redback/users/jdo/JdoUserManager.java
+++ b/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/apache/archiva/redback/users/jdo/JdoUserManager.java
@@ -21,6 +21,8 @@ package org.apache.archiva.redback.users.jdo;
import org.apache.archiva.redback.components.jdo.JdoFactory;
import org.apache.archiva.redback.components.jdo.PlexusJdoUtils;
+import org.apache.archiva.redback.components.jdo.PlexusObjectNotFoundException;
+import org.apache.archiva.redback.components.jdo.PlexusStoreException;
import org.apache.archiva.redback.policy.UserSecurityPolicy;
import org.apache.archiva.redback.users.AbstractUserManager;
import org.apache.archiva.redback.users.PermanentUserException;
@@ -28,8 +30,6 @@ import org.apache.archiva.redback.users.User;
import org.apache.archiva.redback.users.UserManagerException;
import org.apache.archiva.redback.users.UserNotFoundException;
import org.apache.archiva.redback.users.UserQuery;
-import org.apache.archiva.redback.components.jdo.PlexusObjectNotFoundException;
-import org.apache.archiva.redback.components.jdo.PlexusStoreException;
import org.codehaus.plexus.util.StringUtils;
import org.jpox.JDOClassLoaderResolver;
import org.springframework.stereotype.Service;
@@ -49,14 +49,13 @@ import java.util.List;
* JdoUserManager
*
* @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
- *
*/
-@Service( "userManager#jdo" )
+@Service ("userManager#jdo")
public class JdoUserManager
extends AbstractUserManager
{
@Inject
- @Named( value = "jdoFactory#users" )
+ @Named (value = "jdoFactory#users")
private JdoFactory jdoFactory;
@Inject
@@ -105,7 +104,7 @@ public class JdoUserManager
return getAllObjectsDetached( ordering );
}
- @SuppressWarnings( "unchecked" )
+ @SuppressWarnings ("unchecked")
private List<User> getAllObjectsDetached( String ordering )
{
return PlexusJdoUtils.getAllObjectsDetached( getPersistenceManager(), JdoUser.class, ordering, (String) null );
@@ -126,7 +125,7 @@ public class JdoUserManager
return findUsers( "email", emailKey, orderAscending );
}
- @SuppressWarnings( "unchecked" )
+ @SuppressWarnings ("unchecked")
public List<User> findUsersByQuery( UserQuery userQuery )
{
JdoUserQuery uq = (JdoUserQuery) userQuery;
@@ -170,7 +169,7 @@ public class JdoUserManager
}
}
- @SuppressWarnings( "unchecked" )
+ @SuppressWarnings ("unchecked")
private List<User> findUsers( String searchField, String searchKey, boolean ascendingUsername )
{
PersistenceManager pm = getPersistenceManager();
@@ -377,7 +376,7 @@ public class JdoUserManager
userSecurityPolicy.extensionChangePassword( user, passwordChangeRequired );
}
- updateObject( user );
+ user = (User) updateObject( user );
fireUserManagerUserUpdated( user );
--
cgit v1.2.3