Updated Branches: refs/heads/wicket-1.5.x 3d80d9a88 -> 678f3a274
WICKET-4706 SerializableChecker.close throws NPE Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/678f3a27 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/678f3a27 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/678f3a27 Branch: refs/heads/wicket-1.5.x Commit: 678f3a2744bfd71883b1dda0df3ad35ee75bfbaa Parents: 3d80d9a Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Mon Aug 20 11:41:27 2012 +0300 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Mon Aug 20 11:41:27 2012 +0300 ---------------------------------------------------------------------- .../apache/wicket/util/io/SerializableChecker.java | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/678f3a27/wicket-core/src/main/java/org/apache/wicket/util/io/SerializableChecker.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/util/io/SerializableChecker.java b/wicket-core/src/main/java/org/apache/wicket/util/io/SerializableChecker.java index 67950de..ecb405a 100644 --- a/wicket-core/src/main/java/org/apache/wicket/util/io/SerializableChecker.java +++ b/wicket-core/src/main/java/org/apache/wicket/util/io/SerializableChecker.java @@ -333,6 +333,15 @@ public final class SerializableChecker extends ObjectOutputStream writeObjectMethodMissing.clear(); } + @Override + public void close() throws IOException + { + // do not call super.close() because SerializableChecker uses ObjectOutputStream's no-arg constructor + + // just null-ify the declared members + reset(); + } + private void check(Object obj) { if (obj == null)
