You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@syncope.apache.org by as...@apache.org on 2013/01/29 09:56:19 UTC

svn commit: r1439794 - /syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/utils/RestServiceExceptionMapper.java

Author: ashakirin
Date: Tue Jan 29 08:56:19 2013
New Revision: 1439794

URL: http://svn.apache.org/viewvc?rev=1439794&view=rev
Log:
[SYNCOPE-231] Fix for BadRequest exception processing in exception mapper

Modified:
    syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/utils/RestServiceExceptionMapper.java

Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/utils/RestServiceExceptionMapper.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/utils/RestServiceExceptionMapper.java?rev=1439794&r1=1439793&r2=1439794&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/utils/RestServiceExceptionMapper.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/utils/RestServiceExceptionMapper.java Tue Jan 29 08:56:19 2013
@@ -152,7 +152,12 @@ public class RestServiceExceptionMapper 
         ResponseBuilder responseBuilder = Response.status(Response.Status.BAD_REQUEST);
 
         if (ex instanceof javax.ws.rs.BadRequestException) {
-            throw (javax.ws.rs.BadRequestException) ex;
+            if (((javax.ws.rs.BadRequestException) ex).getResponse() != null) {
+                return ((javax.ws.rs.BadRequestException) ex).getResponse();
+            } else {
+                return responseBuilder.build();
+            }
+            
         } else if (ex instanceof InvalidEntityException) {
             SyncopeClientExceptionType exType = SyncopeClientExceptionType.valueOf("Invalid"
                     + ((InvalidEntityException) ex).getEntityClassSimpleName());