summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--server/src/com/vaadin/server/VaadinService.java6
1 files changed, 5 insertions, 1 deletions
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);