From dd039e7d578f9ca19214444c4d87460ab46da9f6 Mon Sep 17 00:00:00 2001 From: 이민희 <mhlee@maprex.co.kr> Date: 목, 13 1월 2022 18:07:43 +0900 Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa --- src/main/java/kr/wisestone/owl/web/resolver/OwlResponseEntityExceptionHandler.java | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/kr/wisestone/owl/web/resolver/OwlResponseEntityExceptionHandler.java b/src/main/java/kr/wisestone/owl/web/resolver/OwlResponseEntityExceptionHandler.java index 9e0fc10..e7d3346 100644 --- a/src/main/java/kr/wisestone/owl/web/resolver/OwlResponseEntityExceptionHandler.java +++ b/src/main/java/kr/wisestone/owl/web/resolver/OwlResponseEntityExceptionHandler.java @@ -57,7 +57,7 @@ Map<String, Object> resJsonData = new HashMap<String, Object>(); resJsonData.put(Constants.RES_KEY_MESSAGE, this.messageAccessor.getResMessage(ex, Constants.RES_KEY_MSG_FAIL)); - return this.handleExceptionInternal(ex, resJsonData, new HttpHeaders(), HttpStatus.BAD_REQUEST, request); + return this.handleExceptionInternal(ex, resJsonData, new HttpHeaders(), HttpStatus.OK, request); } @ExceptionHandler({ StackOverflowError.class, @@ -66,7 +66,7 @@ Map<String, Object> resJsonData = new HashMap<String, Object>(); resJsonData.put(Constants.RES_KEY_MESSAGE, this.messageAccessor.getResMessage(MsgConstants.NOT_READABLE_JSON_DATA, Constants.RES_KEY_MSG_FAIL)); - return this.handleExceptionInternal(ex, resJsonData, new HttpHeaders(), HttpStatus.REQUEST_TIMEOUT, request); + return this.handleExceptionInternal(ex, resJsonData, new HttpHeaders(), HttpStatus.OK, request); } @ExceptionHandler({ Exception.class }) @@ -74,7 +74,7 @@ Map<String, Object> resJsonData = new HashMap<String, Object>(); resJsonData.put(Constants.RES_KEY_MESSAGE, this.messageAccessor.getResMessage(MsgConstants.NOT_READABLE_JSON_DATA, Constants.RES_KEY_MSG_FAIL)); - return this.handleExceptionInternal(ex, resJsonData, new HttpHeaders(), HttpStatus.BAD_REQUEST, request); + return this.handleExceptionInternal(ex, resJsonData, new HttpHeaders(), HttpStatus.OK, request); } @Override @@ -85,7 +85,7 @@ resJsonData.put(Constants.RES_KEY_MESSAGE, this.messageAccessor.getResMessage(MsgConstants.NOT_READABLE_JSON_DATA, Constants.RES_KEY_MSG_FAIL)); - return this.handleExceptionInternal(ex, resJsonData, headers, HttpStatus.BAD_REQUEST, request); + return this.handleExceptionInternal(ex, resJsonData, headers, HttpStatus.OK, request); } @Override -- Gitblit v1.8.0