svn commit: r1679993 - in /openmeetings: branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/user/Organisation.java trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Organisation.java

[solomax]

Author: solomax
Date: Mon May 18 11:16:07 2015
New Revision: 1679993

URL: http://svn.apache.org/r1679993
Log:
Organisations with empty deleted flag are imported as expected

Modified:
    
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/user/Organisation.java
    
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Organisation.java

Modified: 
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/user/Organisation.java
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/user/Organisation.java?rev=1679993&r1=1679992&r2=1679993&view=diff
==============================================================================
--- 
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/user/Organisation.java
 (original)
+++ 
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/user/Organisation.java
 Mon May 18 11:16:07 2015
@@ -75,7 +75,7 @@ public class Organisation implements Ser
        private Date updatetime;
        
        @Column(name="deleted")
-       @Element(data=true)
+       @Element(data = true, required = false)
        private boolean deleted;
        
 

Modified: 
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Organisation.java
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Organisation.java?rev=1679993&r1=1679992&r2=1679993&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Organisation.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Organisation.java
 Mon May 18 11:16:07 2015
@@ -74,7 +74,7 @@ public class Organisation implements IDa
        private Date updatetime;
        
        @Column(name="deleted")
-       @Element(data=true)
+       @Element(data = true, required = false)
        private boolean deleted;