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/10/02 03:41:36 UTC
svn commit: r1628875 - 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: Thu Oct 2 01:41:35 2014
New Revision: 1628875
URL: http://svn.apache.org/r1628875
Log:
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=1628875&r1=1628874&r2=1628875&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 Thu Oct 2 01:41:35 2014
@@ -365,7 +365,7 @@ public class BackupImport {
List<RoomOrganisation> list = readList(serializer, f, "rooms_organisation.xml", "room_organisations", RoomOrganisation.class);
for (RoomOrganisation ro : list) {
- if (!ro.getDeleted()) {
+ if (!ro.getDeleted() && ro.getRoom() != null && ro.getOrganisation() != null && ro.getOrganisation().getOrganisation_id() != null) {
// We need to reset this as openJPA reject to store them otherwise
ro.setRooms_organisation_id(null);
roomOrganisationDao.update(ro, null);
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=1628875&r1=1628874&r2=1628875&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 Thu Oct 2 01:41:35 2014
@@ -366,7 +366,7 @@ public class BackupImport {
List<RoomOrganisation> list = readList(serializer, f, "rooms_organisation.xml", "room_organisations", RoomOrganisation.class);
for (RoomOrganisation ro : list) {
- if (!ro.getDeleted()) {
+ if (!ro.getDeleted() && ro.getRoom() != null && ro.getOrganisation() != null && ro.getOrganisation().getId() != null) {
// We need to reset this as openJPA reject to store them otherwise
ro.setId(null);
roomOrganisationDao.update(ro, null);