You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2013/02/05 11:59:42 UTC
svn commit: r1442532 -
/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupImportController.java
Author: solomax
Date: Tue Feb 5 10:58:32 2013
New Revision: 1442532
URL: http://svn.apache.org/viewvc?rev=1442532&view=rev
Log:
Import: sipUsers are now imported as expected
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupImportController.java
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupImportController.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupImportController.java?rev=1442532&r1=1442531&r2=1442532&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupImportController.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupImportController.java Tue Feb 5 10:58:32 2013
@@ -284,6 +284,9 @@ public class BackupImportController exte
u.setStarttime(new Date());
long userId = u.getUser_id();
u.setUser_id(null);
+ if (u.getSipUser() != null && u.getSipUser().getId() != 0) {
+ u.getSipUser().setId(0);
+ }
usersDao.update(u, -1L);
usersMap.put(userId, u.getUser_id());
}