Updated Branches: refs/heads/master b5e8bbeb1 -> b238b2d2e
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/b238b2d2 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/b238b2d2 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/b238b2d2 Branch: refs/heads/master Commit: b238b2d2e42bf000c00da6c3762af907c114988d Parents: b5e8bbe Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Mon Sep 3 16:14:32 2012 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Mon Sep 3 16:14:32 2012 +0200 ---------------------------------------------------------------------- .../wicket/core/util/lang/WicketObjects.java | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/b238b2d2/wicket-core/src/main/java/org/apache/wicket/core/util/lang/WicketObjects.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/core/util/lang/WicketObjects.java b/wicket-core/src/main/java/org/apache/wicket/core/util/lang/WicketObjects.java index e272aed..055f399 100644 --- a/wicket-core/src/main/java/org/apache/wicket/core/util/lang/WicketObjects.java +++ b/wicket-core/src/main/java/org/apache/wicket/core/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; } }
