Fixed serialization issues

Change-Id: I5dc1f2dc061c4b6bb6d00040b972802df97d3f89

diff --git a/server/src/com/vaadin/server/LocaleService.java b/server/src/com/vaadin/server/LocaleService.java
index 347c4da5c63d48a3d52668c216e710e451125ef9..031ceb433cf37958841fc3e0750a2a9617270835 100644 (file)
--- a/server/src/com/vaadin/server/LocaleService.java
+++ b/server/src/com/vaadin/server/LocaleService.java
@@ -19,6 +19,7 @@
  */
 package com.vaadin.server;
 
+import java.io.Serializable;
 import java.text.DateFormat;
 import java.text.DateFormatSymbols;
 import java.text.SimpleDateFormat;
@@ -37,7 +38,7 @@ import com.vaadin.ui.UI;
  * @since 7.1
  * @author Vaadin Ltd
  */
-public class LocaleService {
+public class LocaleService implements Serializable {
 
     private UI ui;
 

diff --git a/server/src/com/vaadin/server/Page.java b/server/src/com/vaadin/server/Page.java
index 11553527e07e8fb31e8a014c6e5e499ee6e1f1d8..4dd7d34e386b625ebdce96e910f767d4325b2167 100644 (file)
--- a/server/src/com/vaadin/server/Page.java
+++ b/server/src/com/vaadin/server/Page.java
@@ -306,7 +306,7 @@ public class Page implements Serializable {
         }
     }
 
-    private static interface InjectedStyle {
+    private static interface InjectedStyle extends Serializable {
         public void paint(int id, PaintTarget target) throws PaintException;
     }
 

diff --git a/server/tests/src/com/vaadin/tests/server/TestClassesSerializable.java b/server/tests/src/com/vaadin/tests/server/TestClassesSerializable.java
index af6d9ed732a12ae5bfd334421fc33fd8b45ce9fe..63168e3c9173c5f727d38614dc2907de9b67e4da 100644 (file)
--- a/server/tests/src/com/vaadin/tests/server/TestClassesSerializable.java
+++ b/server/tests/src/com/vaadin/tests/server/TestClassesSerializable.java
@@ -60,6 +60,10 @@ public class TestClassesSerializable extends TestCase {
             "com\\.vaadin\\.sass.*", //
             "com\\.vaadin\\.testbench.*", //
             "com\\.vaadin\\.util\\.CurrentInstance\\$1", //
+            "com\\.vaadin\\.server\\.communication\\.PushConnection", //
+            "com\\.vaadin\\.server\\.communication\\.AtmospherePushConnection", //
+            "com\\.vaadin\\.util\\.ConnectorHelper", //
+            "com\\.vaadin\\.server\\.VaadinSession$FutureAccess", //
     };
 
     /**