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 2014/04/14 18:07:08 UTC
svn commit: r1587240 - in /openmeetings:
branches/3.0.x/src/install/java/org/apache/openmeetings/backup/BackupImport.java
trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
Author: solomax
Date: Mon Apr 14 16:07:08 2014
New Revision: 1587240
URL: http://svn.apache.org/r1587240
Log:
[OPENMEETINGS-977] Backup import is fixed
Modified:
openmeetings/branches/3.0.x/src/install/java/org/apache/openmeetings/backup/BackupImport.java
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
Modified: openmeetings/branches/3.0.x/src/install/java/org/apache/openmeetings/backup/BackupImport.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/install/java/org/apache/openmeetings/backup/BackupImport.java?rev=1587240&r1=1587239&r2=1587240&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/install/java/org/apache/openmeetings/backup/BackupImport.java (original)
+++ openmeetings/branches/3.0.x/src/install/java/org/apache/openmeetings/backup/BackupImport.java Mon Apr 14 16:07:08 2014
@@ -414,6 +414,9 @@ public class BackupImport {
if (a.getOwner() != null && a.getOwner().getUser_id() == null) {
a.setOwner(null);
}
+ if (a.getRoom() != null && a.getRoom().getRooms_id() == null) {
+ a.setRoom(null);
+ }
Long newAppId = appointmentDao.addAppointmentObj(a);
appointmentsMap.put(appId, newAppId);
}
@@ -534,6 +537,9 @@ public class BackupImport {
if (storedUC == null && uc.getContact() != null && uc.getContact().getUser_id() != null) {
uc.setUserContactId(0);
+ if (uc.getOwner() != null && uc.getOwner().getUser_id() == null) {
+ uc.setOwner(null);
+ }
Long newId = userContactsDao.addUserContactObj(uc);
userContactsMap.put(ucId, newId);
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java?rev=1587240&r1=1587239&r2=1587240&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java Mon Apr 14 16:07:08 2014
@@ -414,6 +414,9 @@ public class BackupImport {
if (a.getOwner() != null && a.getOwner().getUser_id() == null) {
a.setOwner(null);
}
+ if (a.getRoom() != null && a.getRoom().getRooms_id() == null) {
+ a.setRoom(null);
+ }
Long newAppId = appointmentDao.addAppointmentObj(a);
appointmentsMap.put(appId, newAppId);
}
@@ -534,6 +537,9 @@ public class BackupImport {
if (storedUC == null && uc.getContact() != null && uc.getContact().getUser_id() != null) {
uc.setUserContactId(0);
+ if (uc.getOwner() != null && uc.getOwner().getUser_id() == null) {
+ uc.setOwner(null);
+ }
Long newId = userContactsDao.addUserContactObj(uc);
userContactsMap.put(ucId, newId);
}