Author: echatellier Date: 2014-07-16 12:19:51 +0200 (Wed, 16 Jul 2014) New Revision: 394 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/394 Log: Gestion des statuts d'erreur ajax Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailJsonAction.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailJsonResultSupport.java Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailJsonAction.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailJsonAction.java 2014-07-16 09:55:51 UTC (rev 393) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailJsonAction.java 2014-07-16 10:19:51 UTC (rev 394) @@ -27,14 +27,17 @@ import org.apache.struts2.convention.annotation.Result; import org.apache.struts2.convention.annotation.Results; +import com.opensymphony.xwork2.Action; + /** * Abstract action used to render custom objects as json string using gson directly in response output stream. * * @author Eric Chatellier */ @Results({ - @Result(type = "faxtomail-json", name = "success") + @Result(type = "faxtomail-json", name = Action.SUCCESS), + @Result(type = "faxtomail-json", name = Action.ERROR) }) public abstract class FaxToMailJsonAction extends FaxToMailActionSupport { Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailJsonResultSupport.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailJsonResultSupport.java 2014-07-16 09:55:51 UTC (rev 393) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailJsonResultSupport.java 2014-07-16 10:19:51 UTC (rev 394) @@ -35,6 +35,7 @@ import org.apache.struts2.dispatcher.StrutsResultSupport; import com.google.common.base.Charsets; +import com.opensymphony.xwork2.Action; import com.opensymphony.xwork2.ActionInvocation; public class FaxToMailJsonResultSupport extends StrutsResultSupport { @@ -58,6 +59,11 @@ // IE workaround servletResponse.setContentType("text/plain"); } + + // manage error code + if (!Action.SUCCESS.equals(invocation.getResultCode())) { + servletResponse.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); + } try { ServletOutputStream outputStream = servletResponse.getOutputStream();