From 2e58e97e5297c0e0c718df52ba1c4b30742f3c03 Mon Sep 17 00:00:00 2001
From: Juuso Valli <juuso@vaadin.com>
Date: Wed, 16 Apr 2014 14:47:32 +0300
Subject: Fix findUI throwing NullPointerException when extending Vaadin
 (#13556)

findUI sometimes threw a NPE when the session wasn't set but the UI ID
was. Doesn't occur in normal use, just when doing custom things with
requestStart/requestEnd or runPendingAccessTasks
Change-Id: Id7733567923fa30dcab4946c43b73200c2a0fac2
---
 server/src/com/vaadin/server/VaadinService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'server/src/com')

diff --git a/server/src/com/vaadin/server/VaadinService.java b/server/src/com/vaadin/server/VaadinService.java
index b96e284e6e..ce9badaf98 100644
--- a/server/src/com/vaadin/server/VaadinService.java
+++ b/server/src/com/vaadin/server/VaadinService.java
@@ -982,7 +982,7 @@ public abstract class VaadinService implements Serializable {
         // Get UI id from the request
         String uiIdString = request.getParameter(UIConstants.UI_ID_PARAMETER);
         UI ui = null;
-        if (uiIdString != null) {
+        if (uiIdString != null && session != null) {
             int uiId = Integer.parseInt(uiIdString);
             ui = session.getUIById(uiId);
         }
-- 
cgit v1.2.3