Updated Branches: refs/heads/wicket-1.5.x 7276888cd -> a61993c3d
WICKET-4743 SerializingObjectSizeOfStrategy do not use framework serializer Return -1 if an object cannot be serialized Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/a61993c3 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/a61993c3 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/a61993c3 Branch: refs/heads/wicket-1.5.x Commit: a61993c3d28d053aacd410b481d0c1f61ac65655 Parents: 7276888 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Mon Sep 3 16:15:39 2012 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Mon Sep 3 16:15:39 2012 +0200 ---------------------------------------------------------------------- .../org/apache/wicket/util/lang/WicketObjects.java | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/a61993c3/wicket-core/src/main/java/org/apache/wicket/util/lang/WicketObjects.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/util/lang/WicketObjects.java b/wicket-core/src/main/java/org/apache/wicket/util/lang/WicketObjects.java index 5df6e5d..a1c1500 100644 --- a/wicket-core/src/main/java/org/apache/wicket/util/lang/WicketObjects.java +++ b/wicket-core/src/main/java/org/apache/wicket/util/lang/WicketObjects.java @@ -130,7 +130,12 @@ public class WicketObjects serializer = new JavaSerializer("SerializingObjectSizeOfStrategy"); } byte[] serialized = serializer.serialize(object); - return serialized.length; + int size = -1; + if (serialized != null) + { + size = serialized.length; + } + return size; } }
