Author: solomax
Date: Sat Feb 4 01:32:59 2017
New Revision: 1781638
URL: http://svn.apache.org/viewvc?rev=1781638&view=rev
Log:
[OPENMEETINGS-1549] backup error is fixed
Modified:
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessage.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessage.java
Modified:
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessage.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessage.java?rev=1781638&r1=1781637&r2=1781638&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessage.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessage.java
Sat Feb 4 01:32:59 2017
@@ -113,7 +113,7 @@ public class PrivateMessage implements I
private Long parentMessage;
@Column(name = "private_message_folder_id")
- @Element(data = true, name = "privateMessageFolderId")
+ @Element(data = true, name = "privateMessageFolderId", required = false)
private Long folderId;
@Column(name = "is_contact_request", nullable = false)
@@ -126,7 +126,7 @@ public class PrivateMessage implements I
public PrivateMessage() {
}
-
+
public PrivateMessage(PrivateMessage copy) {
subject = copy.subject;
message = copy.message;
Modified:
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessage.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessage.java?rev=1781638&r1=1781637&r2=1781638&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessage.java
(original)
+++
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessage.java
Sat Feb 4 01:32:59 2017
@@ -113,7 +113,7 @@ public class PrivateMessage implements I
private Long parentMessage;
@Column(name = "private_message_folder_id")
- @Element(data = true, name = "privateMessageFolderId")
+ @Element(data = true, name = "privateMessageFolderId", required = false)
private Long folderId;
@Column(name = "is_contact_request", nullable = false)
@@ -126,7 +126,7 @@ public class PrivateMessage implements I
public PrivateMessage() {
}
-
+
public PrivateMessage(PrivateMessage copy) {
subject = copy.subject;
message = copy.message;