Repository: wicket Updated Branches: refs/heads/wicket-6.x ea9943259 -> 4b251c03b
WICKET-6250 always clear reference to fileUploads in onDetach() Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/4b251c03 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/4b251c03 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/4b251c03 Branch: refs/heads/wicket-6.x Commit: 4b251c03bdfc0afb00fea2f51ab46eabc01cac44 Parents: ea99432 Author: Sven Meier <[email protected]> Authored: Sat Oct 1 23:38:35 2016 +0200 Committer: Sven Meier <[email protected]> Committed: Sat Oct 1 23:39:47 2016 +0200 ---------------------------------------------------------------------- .../html/form/upload/FileUploadField.java | 21 +++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/4b251c03/wicket-core/src/main/java/org/apache/wicket/markup/html/form/upload/FileUploadField.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/upload/FileUploadField.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/upload/FileUploadField.java index badcf8b..07f81f3 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/upload/FileUploadField.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/upload/FileUploadField.java @@ -198,18 +198,21 @@ public class FileUploadField extends FormComponent<List<FileUpload>> @Override protected void onDetach() { - if ((fileUploads != null) && forceCloseStreamsOnDetach()) + if (fileUploads != null) { - for (FileUpload fu : fileUploads) - { - fu.closeStreams(); - } - fileUploads = null; + if (forceCloseStreamsOnDetach()) { + for (FileUpload fu : fileUploads) + { + fu.closeStreams(); + } - if (getModel() != null) - { - getModel().setObject(null); + if (getModel() != null) + { + getModel().setObject(null); + } } + + fileUploads = null; } super.onDetach(); }
