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 2016/09/19 00:49:52 UTC
svn commit: r1761378 - in
/openmeetings/application/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup:
BackupExport.java BackupImport.java
Author: solomax
Date: Mon Sep 19 00:49:52 2016
New Revision: 1761378
URL: http://svn.apache.org/viewvc?rev=1761378&view=rev
Log:
no jira: import/export is improved
Modified:
openmeetings/application/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java
openmeetings/application/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
Modified: openmeetings/application/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java?rev=1761378&r1=1761377&r2=1761378&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java Mon Sep 19 00:49:52 2016
@@ -179,14 +179,22 @@ public class BackupExport {
Registry registry = new Registry();
Strategy strategy = new RegistryStrategy(registry);
Serializer serializer = new Persister(strategy);
-
+
registry.bind(User.class, UserConverter.class);
registry.bind(Appointment.Reminder.class, AppointmentReminderTypeConverter.class);
registry.bind(Room.class, RoomConverter.class);
if (list != null && list.size() > 0) {
- registry.bind(list.get(0).getStart().getClass(), DateConverter.class);
+ for (Appointment a : list) {
+ if (a.getStart() != null) {
+ registry.bind(a.getStart().getClass(), DateConverter.class);
+ break;
+ } else if (a.getInserted() != null) {
+ registry.bind(a.getInserted().getClass(), DateConverter.class);
+ break;
+ }
+ }
}
-
+
writeList(serializer, backup_dir, "appointements.xml", "appointments", list);
progressHolder.setProgress(25);
}
Modified: openmeetings/application/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java?rev=1761378&r1=1761377&r2=1761378&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java Mon Sep 19 00:49:52 2016
@@ -463,6 +463,10 @@ public class BackupImport {
log.warn("Appointment without room was found, skipping: {}", a);
continue;
}
+ if (a.getStart() == null || a.getEnd() == null) {
+ log.warn("Appointment without start/end time was found, skipping: {}", a);
+ continue;
+ }
a = appointmentDao.update(a, null, false);
appointmentsMap.put(appId, a.getId());
}