Repository: wicket Updated Branches: refs/heads/wicket-7.x 6637e363b -> 30d2669ee
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/30d2669e Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/30d2669e Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/30d2669e Branch: refs/heads/wicket-7.x Commit: 30d2669eed71f34b3dabd0870380d1504b6edac9 Parents: 6637e36 Author: Sven Meier <[email protected]> Authored: Sat Oct 1 23:38:35 2016 +0200 Committer: Sven Meier <[email protected]> Committed: Sat Oct 1 23:38:35 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/30d2669e/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 256c076..e604fae 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 @@ -183,18 +183,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(); }
