diff options
| author | adam <adam@vaadin.com> | 2016-11-12 15:25:52 +0200 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2016-11-16 07:40:42 +0000 |
| commit | 9d49d3f78059d440c9fd3f624982674bff8ae7cf (patch) | |
| tree | d768e2a6fd44f03771a6084b834cd9cb85a8499d | |
| parent | 1469891b6f0cb15bf9d684bdb35df8d9531c62f3 (diff) | |
| download | vaadin-framework-9d49d3f78059d440c9fd3f624982674bff8ae7cf.tar.gz vaadin-framework-9d49d3f78059d440c9fd3f624982674bff8ae7cf.zip | |
Fixed drag and drop failure when message dragged from email client (#20451)
When dragging message form email client on Windows, item.webkitGetAsEntry()
might return null creating NPE on the client side. Added additional checks
for this situation.
Change-Id: I569f7e6d0d7b137f24be53d1fbce384695ae8c73
| -rw-r--r-- | client/src/main/java/com/vaadin/client/ui/dd/VHtml5DragEvent.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/client/src/main/java/com/vaadin/client/ui/dd/VHtml5DragEvent.java b/client/src/main/java/com/vaadin/client/ui/dd/VHtml5DragEvent.java index 785d24af74..7eb1af4315 100644 --- a/client/src/main/java/com/vaadin/client/ui/dd/VHtml5DragEvent.java +++ b/client/src/main/java/com/vaadin/client/ui/dd/VHtml5DragEvent.java @@ -90,8 +90,11 @@ public class VHtml5DragEvent extends NativeEvent { // Chrome >= v21 and Opera >= v? if (this.dataTransfer.items) { var item = this.dataTransfer.items[fileIndex]; - if (item.webkitGetAsEntry) { - return item.webkitGetAsEntry().isFile; + if (typeof item.webkitGetAsEntry == "function") { + var entry = item.webkitGetAsEntry(); + if (typeof entry !== "undefined" && entry !== null) { + return entry.isFile; + } } } |