[exo-jcr-commits] exo-jcr SVN: r1233 - ws/branches/2.2.x/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl.

[do-not-reply at jboss.org]

Author: max_shaposhnik
Date: 2009-12-29 07:38:58 -0500 (Tue, 29 Dec 2009)
New Revision: 1233

Modified:
   ws/branches/2.2.x/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/RequestHandlerImpl.java
Log:
EXOJCR-353 added message & header when WebApplicationexception occurs

Modified: ws/branches/2.2.x/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/RequestHandlerImpl.java
===================================================================
--- ws/branches/2.2.x/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/RequestHandlerImpl.java	2009-12-29 12:26:31 UTC (rev 1232)
+++ ws/branches/2.2.x/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/RequestHandlerImpl.java	2009-12-29 12:38:58 UTC (rev 1233)
@@ -178,6 +178,12 @@
                         errorResponse = excmap.toResponse(e);
                      }
                   }
+
+                  if (e.getMessage() != null)
+                     errorResponse =
+                        Response.status(errorResponse.getStatus()).entity(new String(e.getMessage())).type(
+                           MediaType.TEXT_PLAIN).header("JAXRS-Message-Provided", "true").build();
+
                   response.setResponse(errorResponse);
                }
                else
@@ -202,10 +208,17 @@
                            LOG.warn("WedApplication exception occurs.", e.getCause());
                         }
 
-                        // add stack trace as message body
-                        errorResponse =
-                           Response.status(errorResponse.getStatus()).entity(new ErrorStreaming(e)).type(
-                              MediaType.TEXT_PLAIN).build();
+                        // print stack trace & adding ex message into body
+                        if (LOG.isDebugEnabled())
+                        {
+                           e.printStackTrace();
+                        }
+                        if (e.getMessage() != null)
+                           errorResponse =
+                              Response.status(errorResponse.getStatus()).entity(new String(e.getMessage())).type(
+                                 MediaType.TEXT_PLAIN).header("JAXRS-Message-Provided", "true").build();
+                        else
+                           errorResponse =  Response.status(errorResponse.getStatus()).header("JAXRS-Message-Provided", "false").build();
                      }
                   }
                   response.setResponse(errorResponse);