fix JSON empty msg field on /api/system/restart when not in dev mode

diff --git a/server/sonar-server/src/main/java/org/sonar/server/exceptions/ForbiddenException.java b/server/sonar-server/src/main/java/org/sonar/server/exceptions/ForbiddenException.java
index e53f86208174c3bc6ad0e89441d41c1268c22c46..0ac360c29ad82b2e04f39aa01a9e1527aece36fb 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/exceptions/ForbiddenException.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/exceptions/ForbiddenException.java
@@ -19,6 +19,8 @@
  */
 package org.sonar.server.exceptions;
 
+import com.google.common.base.Preconditions;
+
 /**
  * Permission denied. User does not have the required permissions.
  */
@@ -26,11 +28,7 @@ public class ForbiddenException extends ServerException {
 
   private static final int FORBIDDEN = 403;
 
-  public ForbiddenException() {
-    super(FORBIDDEN);
-  }
-
   public ForbiddenException(String message) {
-    super(FORBIDDEN, message);
+    super(FORBIDDEN, Preconditions.checkNotNull(message));
   }
 }

diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/SystemRestartWsAction.java b/server/sonar-server/src/main/java/org/sonar/server/platform/ws/SystemRestartWsAction.java
index f2f6bf94badcfcef0673c36806acf7462a6cd573..92665be650e525e525d93ee3080ecd476bd5d527 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/SystemRestartWsAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/platform/ws/SystemRestartWsAction.java
@@ -56,7 +56,7 @@ public class SystemRestartWsAction implements SystemWsAction {
   @Override
   public void handle(Request request, Response response) {
     if (!settings.getBoolean("sonar.web.dev")) {
-      throw new ForbiddenException();
+      throw new ForbiddenException("Webservice available only in dev mode");
     }
 
     LOGGER.info("Restart server");