The Unified and Autonomous Development Platform
fix: Update StaleStateExceptionHandler and StalePageExceptionHandler to return SC_BAD_REQUEST status
Robin Shene4b9e5c6c221
diff --git a/server-core/src/main/java/io/onedev/server/exception/handler/StaleStateExceptionHandler.java b/server-core/src/main/java/io/onedev/server/exception/handler/StaleStateExceptionHandler.javaindex 074042a91c..203ea7836a 100644--- a/server-core/src/main/java/io/onedev/server/exception/handler/StaleStateExceptionHandler.java+++ b/server-core/src/main/java/io/onedev/server/exception/handler/StaleStateExceptionHandler.java@@ -1,10 +1,10 @@package io.onedev.server.exception.handler;-import io.onedev.server.exception.HttpResponse;+import javax.servlet.http.HttpServletResponse;import org.hibernate.StaleStateException;-import javax.servlet.http.HttpServletResponse;+import io.onedev.server.exception.HttpResponse;public class StaleStateExceptionHandler extends AbstractExceptionHandler<StaleStateException> {@@ -15,7 +15,7 @@ public class StaleStateExceptionHandler extends AbstractExceptionHandler<StaleStvar errorMessage = exception.getMessage();if (errorMessage == null)errorMessage = "Persistence state staled";- return new HttpResponse(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, errorMessage);+ return new HttpResponse(HttpServletResponse.SC_BAD_REQUEST, errorMessage);}}diff --git a/server-core/src/main/java/io/onedev/server/web/exceptionhandler/StalePageExceptionHandler.java b/server-core/src/main/java/io/onedev/server/web/exceptionhandler/StalePageExceptionHandler.javaindex 8546bd32fc..540b47980a 100644--- a/server-core/src/main/java/io/onedev/server/web/exceptionhandler/StalePageExceptionHandler.java+++ b/server-core/src/main/java/io/onedev/server/web/exceptionhandler/StalePageExceptionHandler.java@@ -15,7 +15,7 @@ public class StalePageExceptionHandler extends AbstractExceptionHandler<StalePagString errorMessage = exception.getMessage();if (errorMessage == null)errorMessage = "Stale page";- return new HttpResponse(HttpServletResponse.SC_REQUEST_TIMEOUT, errorMessage);+ return new HttpResponse(HttpServletResponse.SC_BAD_REQUEST, errorMessage);}}