From e5c19eb1f3feb9fd6051c5344e1caa8fe8030072 Mon Sep 17 00:00:00 2001
From: Taras Hupalo <taras.hupalo@gmail.com>
Date: Wed, 27 Aug 2014 11:17:53 +0300
Subject: [PATCH] Fixed creation of "appError" json object with nullable url
 (#8942)

Change-Id: I401d4df4cc089ea1f0988dfd670b0823fc06f8a4
---
 server/src/com/vaadin/server/VaadinService.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/server/src/com/vaadin/server/VaadinService.java b/server/src/com/vaadin/server/VaadinService.java
index cf50ba7210..8fd6da8dee 100644
--- a/server/src/com/vaadin/server/VaadinService.java
+++ b/server/src/com/vaadin/server/VaadinService.java
@@ -1579,7 +1579,11 @@ public abstract class VaadinService implements Serializable {
             JsonObject appError = Json.createObject();
             appError.put("caption", caption);
             appError.put("message", message);
-            appError.put("url", url);
+            if (url == null) {
+                appError.put("url", Json.createNull());
+            } else {
+                appError.put("url", url);
+            }
 
             JsonObject meta = Json.createObject();
             meta.put("appError", appError);
-- 
2.39.5