From 5dd3163dd2a669919363d398cf7e9f35343241a7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Lesaint?= Date: Thu, 30 Apr 2015 14:59:54 +0200 Subject: [PATCH] fix JSON empty msg field on /api/system/restart when not in dev mode --- .../org/sonar/server/exceptions/ForbiddenException.java | 8 +++----- .../sonar/server/platform/ws/SystemRestartWsAction.java | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) 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 e53f8620817..0ac360c29ad 100644 --- 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 f2f6bf94bad..92665be650e 100644 --- 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"); -- 2.39.5