Author: solomax
Date: Wed Oct 5 15:36:30 2016
New Revision: 1763458
URL: http://svn.apache.org/viewvc?rev=1763458&view=rev
Log:
[OPENMEETINGS-553] build should be fixed
Modified:
openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
Modified:
openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java?rev=1763458&r1=1763457&r2=1763458&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
Wed Oct 5 15:36:30 2016
@@ -451,7 +451,7 @@ public class BackupImport {
Serializer serializer = new Persister(strategy);
registry.bind(User.class, new UserConverter(userDao,
userMap));
//registry.bind(OmCalendar.SyncType.class,
OmCalendarSyncTypeConverter.class);
- List<OmCalendar> list = readList(serializer, f,
"calendars.xml", "calendars", OmCalendar.class);
+ List<OmCalendar> list = readList(serializer, f,
"calendars.xml", "calendars", OmCalendar.class, true);
for (OmCalendar a : list) {
}
Modified:
openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java?rev=1763458&r1=1763457&r2=1763458&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
(original)
+++
openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
Wed Oct 5 15:36:30 2016
@@ -451,7 +451,7 @@ public class BackupImport {
Serializer serializer = new Persister(strategy);
registry.bind(User.class, new UserConverter(userDao,
userMap));
//registry.bind(OmCalendar.SyncType.class,
OmCalendarSyncTypeConverter.class);
- List<OmCalendar> list = readList(serializer, f,
"calendars.xml", "calendars", OmCalendar.class);
+ List<OmCalendar> list = readList(serializer, f,
"calendars.xml", "calendars", OmCalendar.class, true);
for (OmCalendar a : list) {
}
