summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonatan Kronqvist <jonatan@vaadin.com>2013-09-03 09:53:10 +0300
committerVaadin Code Review <review@vaadin.com>2013-09-03 06:58:48 +0000
commit11cdf93fedc9e693468d25092afba8172ce8ebf0 (patch)
treec380168f03c5d4c1d9508766c63775066dd9191f
parent4c5bb0e1d5920682604d69ba49d936316da54c70 (diff)
downloadvaadin-framework-11cdf93fedc9e693468d25092afba8172ce8ebf0.tar.gz
vaadin-framework-11cdf93fedc9e693468d25092afba8172ce8ebf0.zip
Excludes WeakValueMap from the serializable test #12401
Also added a note to the WeakValueMap JavaDoc stating that it is not serializable. Change-Id: If342746ad7c7cac0db8bac4ba75236970cc4cd01
-rw-r--r--server/src/com/vaadin/util/WeakValueMap.java2
-rw-r--r--server/tests/src/com/vaadin/tests/server/TestClassesSerializable.java1
2 files changed, 3 insertions, 0 deletions
diff --git a/server/src/com/vaadin/util/WeakValueMap.java b/server/src/com/vaadin/util/WeakValueMap.java
index b5ac12ce91..1134594cba 100644
--- a/server/src/com/vaadin/util/WeakValueMap.java
+++ b/server/src/com/vaadin/util/WeakValueMap.java
@@ -30,6 +30,8 @@ import java.util.Set;
* A Map holding weak references to its values. It is internally backed by a
* normal HashMap and all values are stored as WeakReferences. Garbage collected
* entries are removed when touched.
+ * <p>
+ * <em>Note</em> this class is not serializable.
*
* @author Vaadin Ltd
* @since 7.1.4
diff --git a/server/tests/src/com/vaadin/tests/server/TestClassesSerializable.java b/server/tests/src/com/vaadin/tests/server/TestClassesSerializable.java
index 2a7e456fcb..e5420b8921 100644
--- a/server/tests/src/com/vaadin/tests/server/TestClassesSerializable.java
+++ b/server/tests/src/com/vaadin/tests/server/TestClassesSerializable.java
@@ -65,6 +65,7 @@ public class TestClassesSerializable extends TestCase {
"com\\.vaadin\\.util\\.ConnectorHelper", //
"com\\.vaadin\\.server\\.VaadinSession\\$FutureAccess", //
"com\\.vaadin\\.external\\..*", //
+ "com\\.vaadin\\.util\\.WeakValueMap.*", //
};
/**