Author: solomax
Date: Mon Jul 13 05:29:23 2015
New Revision: 1690567
URL: http://svn.apache.org/r1690567
Log:
Possible backup error is fixed
Modified:
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/user/UserDao.java
openmeetings/branches/3.0.x/src/install/java/org/apache/openmeetings/backup/BackupExport.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java
Modified:
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/user/UserDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/user/UserDao.java?rev=1690567&r1=1690566&r2=1690567&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/user/UserDao.java
(original)
+++
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/user/UserDao.java
Mon Jul 13 05:29:23 2015
@@ -208,6 +208,9 @@ public class UserDao implements IDataPro
}
}
if (u.getUser_id() == null) {
+ if (u.getRegdate() == null) {
+ u.setRegdate(new Date());
+ }
u.setStarttime(new Date());
em.persist(u);
} else {
Modified:
openmeetings/branches/3.0.x/src/install/java/org/apache/openmeetings/backup/BackupExport.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/install/java/org/apache/openmeetings/backup/BackupExport.java?rev=1690567&r1=1690566&r2=1690567&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/install/java/org/apache/openmeetings/backup/BackupExport.java
(original)
+++
openmeetings/branches/3.0.x/src/install/java/org/apache/openmeetings/backup/BackupExport.java
Mon Jul 13 05:29:23 2015
@@ -463,7 +463,8 @@ public class BackupExport {
registry.bind(Organisation.class, OrganisationConverter.class);
registry.bind(State.class, StateConverter.class);
if (list != null && list.size() > 0) {
- registry.bind(list.get(0).getRegdate().getClass(),
DateConverter.class);
+ Class<?> dateClass = list.get(0).getRegdate() != null ?
list.get(0).getRegdate().getClass() : list.get(0).getStarttime().getClass();
+ registry.bind(dateClass, DateConverter.class);
}
writeList(serializer, os, "users", list);
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java?rev=1690567&r1=1690566&r2=1690567&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
Mon Jul 13 05:29:23 2015
@@ -208,6 +208,9 @@ public class UserDao implements IDataPro
}
}
if (u.getId() == null) {
+ if (u.getRegdate() == null) {
+ u.setRegdate(new Date());
+ }
u.setInserted(new Date());
em.persist(u);
} else {
Modified:
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java?rev=1690567&r1=1690566&r2=1690567&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java
Mon Jul 13 05:29:23 2015
@@ -463,7 +463,8 @@ public class BackupExport {
registry.bind(Organisation.class, OrganisationConverter.class);
registry.bind(State.class, StateConverter.class);
if (list != null && list.size() > 0) {
- registry.bind(list.get(0).getRegdate().getClass(),
DateConverter.class);
+ Class<?> dateClass = list.get(0).getRegdate() != null ?
list.get(0).getRegdate().getClass() : list.get(0).getInserted().getClass();
+ registry.bind(dateClass, DateConverter.class);
}
writeList(serializer, os, "users", list);
