From 8c1fd109b4d993e6349d0b6e93cb8bd7a260bd40 Mon Sep 17 00:00:00 2001
From: Rick Herrick <jrherrick@wustl.edu>
Date: Fri, 9 Sep 2016 14:27:52 -0500
Subject: [PATCH] XNAT-4014 Changed handling of NrgServiceException to fix
incorrect status code, handle exception from XSync plugin correctly.
---
src/main/java/org/nrg/xapi/rest/XapiRestControllerAdvice.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/org/nrg/xapi/rest/XapiRestControllerAdvice.java b/src/main/java/org/nrg/xapi/rest/XapiRestControllerAdvice.java
index 5775a149..9fbeba63 100644
--- a/src/main/java/org/nrg/xapi/rest/XapiRestControllerAdvice.java
+++ b/src/main/java/org/nrg/xapi/rest/XapiRestControllerAdvice.java
@@ -40,7 +40,7 @@ public class XapiRestControllerAdvice {
@ExceptionHandler(NrgServiceException.class)
public ModelAndView handleNrgServiceException(final HttpServletRequest request, final NrgServiceException exception) {
- return handleException(HttpStatus.CONFLICT, request, "An NRG service error occurred.", exception);
+ return handleException(HttpStatus.INTERNAL_SERVER_ERROR, request, "An NRG service error occurred.", exception);
}
@ExceptionHandler(URISyntaxException.class)
--
GitLab