From: Olivier Lamy <olamy@apache.org>
Date: Thu, 21 Feb 2013 14:36:18 +0000 (+0000)
Subject: add error message in case of error 500
X-Git-Tag: archiva-1.4-M4~152
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7f806d34dc1ae4e4855a000d0c98f5d063791077;p=archiva.git

add error message in case of error 500

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1448653 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/startup.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/startup.js
index e40a1a310..a1df1613e 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/startup.js
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/startup.js
@@ -49,7 +49,12 @@ function(jquery,sammy,utils) {
         removeSmallSpinnerImg();
         removeMediumSpinnerImg("#main-content");
         clearUserMessages();
-        displayRestError($.parseJSON(data.responseText));
+        try {
+          displayRestError($.parseJSON(data.responseText));
+        } catch (e) {
+          //maybe not a json reponse
+          displayErrorMessage($.i18n.prop('error.500'));
+        }
       },
       204: function(){
         remoteLogInfo(null,"found 204:"+this.url);