From 52013fc6c6ccc0891df79b7fa2c7cce1b9a4f036 Mon Sep 17 00:00:00 2001
From: Dyorgio Nascimento <dyorgio@gmail.com>
Date: Thu, 2 Apr 2020 10:01:41 -0300
Subject: Fix NPE in FileUploadHandler when use Upload.interruptUpload().
 (#11797)

Fixes #11806
---
 server/src/main/java/com/vaadin/ui/ConnectorTracker.java | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/server/src/main/java/com/vaadin/ui/ConnectorTracker.java b/server/src/main/java/com/vaadin/ui/ConnectorTracker.java
index b2cb185e0a..b8f0ecde95 100644
--- a/server/src/main/java/com/vaadin/ui/ConnectorTracker.java
+++ b/server/src/main/java/com/vaadin/ui/ConnectorTracker.java
@@ -878,10 +878,12 @@ public class ConnectorTracker implements Serializable {
         }
         Map<String, StreamVariable> nameToStreamVar = pidToNameToStreamVariable
                 .get(connectorId);
-        StreamVariable streamVar = nameToStreamVar.remove(variableName);
-        streamVariableToSeckey.remove(streamVar);
-        if (nameToStreamVar.isEmpty()) {
-            pidToNameToStreamVariable.remove(connectorId);
+        if (nameToStreamVar != null) {
+            StreamVariable streamVar = nameToStreamVar.remove(variableName);
+            streamVariableToSeckey.remove(streamVar);
+            if (nameToStreamVar.isEmpty()) {
+                pidToNameToStreamVariable.remove(connectorId);
+            }
         }
     }
 
-- 
cgit v1.2.3