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 e40a1a310b90e2dea2ac8658efd71c8e7b2fbe40..a1df1613e9e1409e9d1f2a6aedfde3270a1f7a9d 100644 (file)
--- 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);