diff options
| author | Artur Signell <artur@vaadin.com> | 2013-06-07 00:29:12 +0300 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2013-06-07 07:07:03 +0000 |
| commit | da29e2b1a50b3e8d7240e9c76d829042772f65ef (patch) | |
| tree | 8cb6ea2742d0918cb399d1adda9a3a663d89a0bb | |
| parent | f9bffedb2d38060ce9f935f346850e4784e846c8 (diff) | |
| download | vaadin-framework-da29e2b1a50b3e8d7240e9c76d829042772f65ef.tar.gz vaadin-framework-da29e2b1a50b3e8d7240e9c76d829042772f65ef.zip | |
Fixed serialization issues
Change-Id: I5dc1f2dc061c4b6bb6d00040b972802df97d3f89
| -rw-r--r-- | server/src/com/vaadin/server/LocaleService.java | 3 | ||||
| -rw-r--r-- | server/src/com/vaadin/server/Page.java | 2 | ||||
| -rw-r--r-- | 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", // }; /** |