From 10e7a466bc936737b81005cb50d90c8bc8ca49bd Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Wed, 24 Jun 2015 23:28:22 +0300
Subject: Pass critical notification details to the client (#18342)

Change-Id: I3c4eace624453eb854a32fef5fe44d253b164f62
---
 server/src/com/vaadin/server/VaadinService.java | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

(limited to 'server/src')

diff --git a/server/src/com/vaadin/server/VaadinService.java b/server/src/com/vaadin/server/VaadinService.java
index 74f0051e30..bff71fedee 100644
--- a/server/src/com/vaadin/server/VaadinService.java
+++ b/server/src/com/vaadin/server/VaadinService.java
@@ -1574,8 +1574,8 @@ public abstract class VaadinService implements Serializable {
             JsonObject appError = Json.createObject();
             putValueOrJsonNull(appError, "caption", caption);
             putValueOrJsonNull(appError, "url", url);
-            putValueOrJsonNull(appError, "message",
-                    createCriticalNotificationMessage(message, details));
+            putValueOrJsonNull(appError, "message", message);
+            putValueOrJsonNull(appError, "details", details);
 
             JsonObject meta = Json.createObject();
             meta.put("appError", appError);
@@ -1595,17 +1595,6 @@ public abstract class VaadinService implements Serializable {
         return "for(;;);[" + returnString + "]";
     }
 
-    private static String createCriticalNotificationMessage(String message,
-            String details) {
-        if (message == null) {
-            return details;
-        } else if (details != null) {
-            return message + "<br/><br/>" + details;
-        }
-
-        return message;
-    }
-
     private static void putValueOrJsonNull(JsonObject json, String key,
             String value) {
         if (value == null) {
-- 
cgit v1.2.3