[empire-db] branch version3 updated: EMPIREDB-362 Serializable fix

[doebele]

This is an automated email from the ASF dual-hosted git repository.

doebele pushed a commit to branch version3
in repository https://gitbox.apache.org/repos/asf/empire-db.git


The following commit(s) were added to refs/heads/version3 by this push:
     new 131306e  EMPIREDB-362 Serializable fix
131306e is described below

commit 131306e85f1e4269c985fd1c0db8109b0a6a0be2
Author: Rainer Döbele <doeb...@apache.org>
AuthorDate: Wed Feb 9 15:57:36 2022 +0100

    EMPIREDB-362 Serializable fix
---
 empire-db/src/main/java/org/apache/empire/db/DBRecord.java     | 3 +--
 empire-db/src/main/java/org/apache/empire/db/DBRecordBase.java | 5 ++++-
 empire-db/src/main/java/org/apache/empire/db/DBRecordBean.java | 3 +--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/empire-db/src/main/java/org/apache/empire/db/DBRecord.java 
b/empire-db/src/main/java/org/apache/empire/db/DBRecord.java
index 0c7ac35..0855195 100644
--- a/empire-db/src/main/java/org/apache/empire/db/DBRecord.java
+++ b/empire-db/src/main/java/org/apache/empire/db/DBRecord.java
@@ -21,7 +21,6 @@ package org.apache.empire.db;
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
-import java.io.Serializable;
 import java.sql.Connection;
 import java.util.HashMap;
 import java.util.Map;
@@ -53,7 +52,7 @@ import org.slf4j.LoggerFactory;
  * 
  * The record is Serializable either if the provided DBContext is 
serializable, or if the Context is provided on deserialization in a derived 
class.
  */
-public class DBRecord extends DBRecordBase implements Serializable // really 
Serializable?
+public class DBRecord extends DBRecordBase
 {
     private static final long serialVersionUID = 1L;
     
diff --git a/empire-db/src/main/java/org/apache/empire/db/DBRecordBase.java 
b/empire-db/src/main/java/org/apache/empire/db/DBRecordBase.java
index 692eb4b..3213752 100644
--- a/empire-db/src/main/java/org/apache/empire/db/DBRecordBase.java
+++ b/empire-db/src/main/java/org/apache/empire/db/DBRecordBase.java
@@ -18,6 +18,7 @@
  */
 package org.apache.empire.db;
 
+import java.io.Serializable;
 import java.lang.reflect.InvocationTargetException;
 import java.sql.Connection;
 import java.util.Collection;
@@ -61,8 +62,10 @@ import org.w3c.dom.Element;
  * 
  * Also, field value changes, can be handled using the onFieldChanged event.
  */
-public abstract class DBRecordBase extends DBRecordData implements Record, 
Cloneable
+public abstract class DBRecordBase extends DBRecordData implements Record, 
Cloneable, Serializable
 {
+    private static final long serialVersionUID = 1L;
+    
     private static final Logger log  = 
LoggerFactory.getLogger(DBRecordBase.class);
     
     /**
diff --git a/empire-db/src/main/java/org/apache/empire/db/DBRecordBean.java 
b/empire-db/src/main/java/org/apache/empire/db/DBRecordBean.java
index 03a8ad2..bdcb7ac 100644
--- a/empire-db/src/main/java/org/apache/empire/db/DBRecordBean.java
+++ b/empire-db/src/main/java/org/apache/empire/db/DBRecordBean.java
@@ -18,7 +18,6 @@
  */
 package org.apache.empire.db;
 
-import java.io.Serializable;
 import java.sql.Connection;
 
 import org.apache.empire.commons.StringUtils;
@@ -40,7 +39,7 @@ import org.slf4j.LoggerFactory;
  * Thus it has a Default constructor and is essentially a dynamic bean
  * 
  */
-public class DBRecordBean extends DBRecordBase implements Serializable
+public class DBRecordBean extends DBRecordBase
 {
     private static final long serialVersionUID = 1L;