Updated Branches: refs/heads/master 4fc82e359 -> b719561b4
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/b719561b Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/b719561b Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/b719561b Branch: refs/heads/master Commit: b719561b4429941ccbd705ac1ddd13e4aa1aec0e Parents: 4fc82e3 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:42:02 2012 +0300 ---------------------------------------------------------------------- .../wicket/core/util/io/SerializableChecker.java | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/b719561b/wicket-core/src/main/java/org/apache/wicket/core/util/io/SerializableChecker.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/core/util/io/SerializableChecker.java b/wicket-core/src/main/java/org/apache/wicket/core/util/io/SerializableChecker.java index 6da7f1d..57f8317 100644 --- a/wicket-core/src/main/java/org/apache/wicket/core/util/io/SerializableChecker.java +++ b/wicket-core/src/main/java/org/apache/wicket/core/util/io/SerializableChecker.java @@ -349,6 +349,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)
