From da29e2b1a50b3e8d7240e9c76d829042772f65ef Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Fri, 7 Jun 2013 00:29:12 +0300
Subject: Fixed serialization issues

Change-Id: I5dc1f2dc061c4b6bb6d00040b972802df97d3f89
---
 server/src/com/vaadin/server/LocaleService.java                       | 3 ++-
 server/src/com/vaadin/server/Page.java                                | 2 +-
 server/tests/src/com/vaadin/tests/server/TestClassesSerializable.java | 4 ++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/server/src/com/vaadin/server/LocaleService.java b/server/src/com/vaadin/server/LocaleService.java
index 347c4da5c6..031ceb433c 100644
--- 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 11553527e0..4dd7d34e38 100644
--- 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 af6d9ed732..63168e3c91 100644
--- 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", //
     };
 
     /**
-- 
cgit v1.2.3