fixes #1407

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/UserService.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/UserService.java
index b04a68ac84ea743e74fdbaf361e5c4054687695c..bf3ea66da492aebf0632a4472020be8b6658c6ed 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/UserService.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/UserService.java
@@ -192,6 +192,10 @@ public class UserService extends ServiceBase<User,IUserDao> implements IUserServ
                return user != null;\r
        }\r
 \r
                return user != null;\r
        }\r
 \r

+       /**\r
+        * DO NOT CALL THIS METHOD IN LONG RUNNING SESSIONS OR CONVERSATIONS\r
+        * A THROWN UsernameNotFoundException WILL RENDER THE CONVERSATION UNUSABLE\r
+        */\r

        public UserDetails loadUserByUsername(String username)\r
                        throws UsernameNotFoundException, DataAccessException {\r
                Assert.hasText(username);\r
        public UserDetails loadUserByUsername(String username)\r
                        throws UsernameNotFoundException, DataAccessException {\r
                Assert.hasText(username);\r


@@ -316,11 +320,10 @@ public class UserService extends ServiceBase<User,IUserDao> implements IUserServ
        public UUID save(User user) {\r
                if(user.getId() == 0 || dao.load(user.getUuid()) == null){\r
                        createUser(user);\r
        public UUID save(User user) {\r
                if(user.getId() == 0 || dao.load(user.getUuid()) == null){\r
                        createUser(user);\r

+               }else{\r
+                       updateUser(user);\r

                }\r
                }\r

-               updateUser(user);\r
-               \r

                return user.getUuid(); \r
                return user.getUuid(); \r

-//             return dao.save(user);\r

        }\r
 \r
        @Override\r
        }\r
 \r
        @Override\r