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

Posted to commits@tomee.apache.org by tv...@apache.org on 2012/06/13 20:23:02 UTC

svn commit: r1349980 - /openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/JsonExecutor.java

Author: tveronezi
Date: Wed Jun 13 18:23:02 2012
New Revision: 1349980

URL: http://svn.apache.org/viewvc?rev=1349980&view=rev
Log:
https://issues.apache.org/jira/browse/TOMEE-224
* catch Throwable

Modified:
    openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/JsonExecutor.java

Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/JsonExecutor.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/JsonExecutor.java?rev=1349980&r1=1349979&r2=1349980&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/JsonExecutor.java (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/JsonExecutor.java Wed Jun 13 18:23:02 2012
@@ -45,14 +45,14 @@ public class JsonExecutor {
             resp.setCharacterEncoding("UTF-8");
 
             final Gson gson;
-            if(Boolean.valueOf(req.getParameter("pretty"))) {
+            if (Boolean.valueOf(req.getParameter("pretty"))) {
                 gson = new GsonBuilder().setPrettyPrinting().create();
             } else {
                 gson = new Gson();
             }
             resp.getWriter().write(gson.toJson(result));
 
-        } catch (Exception e) {
+        } catch (Throwable e) {
             //this will redirect the result to the ErrorServlet
             throw new TomeeException(e);
         }