diff options
| author | Taras Hupalo <taras.hupalo@gmail.com> | 2014-08-27 11:17:53 +0300 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2014-08-27 11:48:03 +0000 |
| commit | e5c19eb1f3feb9fd6051c5344e1caa8fe8030072 (patch) | |
| tree | c462ac9b2a026fac41a70a564a0f219f497ef738 /server | |
| parent | 0af15f64a1143c5fa030b1837389bb4122195f77 (diff) | |
| download | vaadin-framework-e5c19eb1f3feb9fd6051c5344e1caa8fe8030072.tar.gz vaadin-framework-e5c19eb1f3feb9fd6051c5344e1caa8fe8030072.zip | |
Fixed creation of "appError" json object with nullable url (#8942)
Change-Id: I401d4df4cc089ea1f0988dfd670b0823fc06f8a4
Diffstat (limited to 'server')
| -rw-r--r-- | server/src/com/vaadin/server/VaadinService.java | 6 |
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); |