Author: solomax
Date: Thu Feb 7 10:50:11 2013
New Revision: 1443397
URL: http://svn.apache.org/viewvc?rev=1443397&view=rev
Log:
Import: fix for backup_v_1_7_0_r3822.zip import
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/backup/DateConverter.java
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/backup/DateConverter.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/backup/DateConverter.java?rev=1443397&r1=1443396&r2=1443397&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/backup/DateConverter.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/backup/DateConverter.java
Thu Feb 7 10:50:11 2013
@@ -28,7 +28,7 @@ import org.simpleframework.xml.stream.Ou
public class DateConverter implements Converter<Date> {
public Date read(InputNode node) throws Exception {
String val = node.getValue();
- return val == null ? new Date() :
CalendarPatterns.parseImportDate(val);
+ return val == null || "null".equals(val) ? new Date() :
CalendarPatterns.parseImportDate(val);
}
public void write(OutputNode node, Date value) throws Exception {
