openmeetings-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From solo...@apache.org
Subject svn commit: r1442500 - in /openmeetings/trunk/singlewebapp/src/org/apache/openmeetings: data/user/Usermanagement.java data/user/dao/UsersDao.java ldap/LdapLoginManagement.java
Date Tue, 05 Feb 2013 08:40:26 GMT
Author: solomax
Date: Tue Feb  5 08:40:25 2013
New Revision: 1442500

URL: http://svn.apache.org/viewvc?rev=1442500&view=rev
Log:
Code clean up: Copy/pasted method was removed

Modified:
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Usermanagement.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UsersDao.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/ldap/LdapLoginManagement.java

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Usermanagement.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Usermanagement.java?rev=1442500&r1=1442499&r2=1442500&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Usermanagement.java
(original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Usermanagement.java
Tue Feb  5 08:40:25 2013
@@ -1549,7 +1549,7 @@ public class Usermanagement {
 	}
 
 	public void updateUser(User user) {
-		usersDao.update(user);
+		usersDao.update(user, 1L);
 	}
 
 	/**

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UsersDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UsersDao.java?rev=1442500&r1=1442499&r2=1442500&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UsersDao.java
(original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UsersDao.java
Tue Feb  5 08:40:25 2013
@@ -139,17 +139,6 @@ public class UsersDao implements IDataPr
 		return u;
 	}
 	
-	public User update(User u) {
-		if (u.getUser_id() == null) {
-			u.setStarttime(new Date());
-			em.persist(u);
-		} else {
-			u.setUpdatetime(new Date());
-			u =	em.merge(u);
-		}
-		return u;
-	}
-
 	public void delete(User u, long userId) {
 		deleteUserID(u.getUser_id());
 	}

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/ldap/LdapLoginManagement.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/ldap/LdapLoginManagement.java?rev=1442500&r1=1442499&r2=1442500&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/ldap/LdapLoginManagement.java
(original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/ldap/LdapLoginManagement.java
Tue Feb  5 08:40:25 2013
@@ -726,7 +726,7 @@ public class LdapLoginManagement {
 			
 			User user = usersDao.get(newUserId);
 			user.setPictureuri(pictureUri);
-			usersDao.update(user);
+			usersDao.update(user, 1L);
 
 		} catch (Exception e) {
 			log.error("Error creating user : " + e.getMessage());



Mime
View raw message