Ensure all server and shared classes are serializable (#10735)

Change-Id: I40a59087fea7fbd4ad202ef803b42bbc76bf94d3

2 files changed, 4 insertions, 2 deletions

diff --git a/server/src/com/vaadin/util/CurrentInstance.java b/server/src/com/vaadin/util/CurrentInstance.java
index 805a8108f7..adf6d963c3 100644
--- a/server/src/com/vaadin/util/CurrentInstance.java
+++ b/server/src/com/vaadin/util/CurrentInstance.java
@@ -16,6 +16,7 @@
 
 package com.vaadin.util;
 
+import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -27,7 +28,7 @@ import java.util.Map.Entry;
  * @version @VERSION@
  * @since 7.0.0
  */
-public class CurrentInstance {
+public class CurrentInstance implements Serializable {
     private final Object instance;
     private final boolean inheritable;
 
diff --git a/server/src/com/vaadin/util/ReflectTools.java b/server/src/com/vaadin/util/ReflectTools.java
index 956b09b922..6fccd365fb 100644
--- a/server/src/com/vaadin/util/ReflectTools.java
+++ b/server/src/com/vaadin/util/ReflectTools.java
@@ -17,6 +17,7 @@ package com.vaadin.util;
 
 import java.beans.IntrospectionException;
 import java.beans.PropertyDescriptor;
+import java.io.Serializable;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
@@ -27,7 +28,7 @@ import java.lang.reflect.Method;
  * 
  * @since 6.2
  */
-public class ReflectTools {
+public class ReflectTools implements Serializable {
     /**
      * Locates the method in the given class. Returns null if the method is not
      * found. Throws an ExceptionInInitializerError if there is a problem