summaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2012-11-16 17:24:54 +0200
committerArtur Signell <artur@vaadin.com>2012-11-19 12:33:26 +0200
commit02a808548472a8aa66631fdbf5ee119b24061a92 (patch)
tree33fbd1105e7d55d6cfad83a1256e4f3608f6a334 /client
parent17ec88776b8ef9118d964b7de54f492aaaa64f26 (diff)
downloadvaadin-framework-02a808548472a8aa66631fdbf5ee119b24061a92.tar.gz
vaadin-framework-02a808548472a8aa66631fdbf5ee119b24061a92.zip
Fix NPE when removing FileDownloader (#10198)
Change-Id: I2423e3fbe88becfd76ed17c15d911d9253bf6e35
Diffstat (limited to 'client')
-rw-r--r--client/src/com/vaadin/client/extensions/FileDownloaderConnector.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/client/src/com/vaadin/client/extensions/FileDownloaderConnector.java b/client/src/com/vaadin/client/extensions/FileDownloaderConnector.java
index 6308de9c05..61a8bee9d3 100644
--- a/client/src/com/vaadin/client/extensions/FileDownloaderConnector.java
+++ b/client/src/com/vaadin/client/extensions/FileDownloaderConnector.java
@@ -69,7 +69,7 @@ public class FileDownloaderConnector extends AbstractExtensionConnector
@Override
public void setParent(ServerConnector parent) {
super.setParent(parent);
- if (parent == null) {
+ if (parent == null && iframe != null) {
iframe.removeFromParent();
}
}