From richfaces-svn-commits at lists.jboss.org Mon Jul 14 06:20:28 2008 Content-Type: multipart/mixed; boundary="===============9196032037897817756==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r9559 - trunk/framework/impl/src/main/java/org/ajax4jsf/webapp. Date: Mon, 14 Jul 2008 06:20:27 -0400 Message-ID: --===============9196032037897817756== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: abelevich Date: 2008-07-14 06:20:27 -0400 (Mon, 14 Jul 2008) New Revision: 9559 Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/BaseFilter.java Log: RF-3808, rename stop action to the richfaces_file_upload_action_stop Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/BaseFilter= .java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/BaseFilter.java = 2008-07-14 09:58:18 UTC (rev 9558) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/BaseFilter.java = 2008-07-14 10:20:27 UTC (rev 9559) @@ -289,102 +289,92 @@ * @throws IOException = * @throws ServletException = */ - protected void processUploadsAndHandleRequest(HttpServletRequest request,= HttpServletResponse response, - FilterChain chain) throws IOException, ServletException { - HttpServletRequest httpRequest =3D (HttpServletRequest) request; - String uid =3D httpRequest.getParameter(UPLOAD_FILES_ID); - if (uid !=3D null) { - if (isMultipartRequest(httpRequest)) { - MultipartRequest multipartRequest =3D new MultipartRequest( - httpRequest, createTempFiles, maxRequestSize, uid); - - Map sessionsMap =3D null; - Map percentMap =3D null; - boolean sendError =3D Boolean.parseBoolean(request.getParameter(SEND= _HTTP_ERROR)); - String mimeType =3D xmlFilter.getMimetype(); - try { - if (isFileSizeRestricted(request, maxRequestSize)) { - if (sendError) { - //request.getInputStream().close(); - //request.getInputStream().skip(request.getContentLength()); - response.sendError(413); - System.out.println("413"); - return; - } else { - printResponse(response, - ""); - } - } else if (!checkFileCount(httpRequest)) { - printResponse(response, - ""); + protected void processUploadsAndHandleRequest(HttpServletRequest request,= HttpServletResponse response, FilterChain chain) throws IOException, Servl= etException { + HttpServletRequest httpRequest =3D (HttpServletRequest) request; + String uid =3D httpRequest.getParameter(UPLOAD_FILES_ID); + if (uid !=3D null) { + = + if (isMultipartRequest(httpRequest)) { + MultipartRequest multipartRequest =3D new MultipartRequest(httpRequest, = createTempFiles, maxRequestSize, uid); + Map sessionsMap =3D null; + Map percentMap =3D null; + = + try { + if (isFileSizeRestricted(request, maxRequestSize)) { + = + boolean sendError =3D Boolean.parseBoolean(request.getParameter(SEND_HT= TP_ERROR)); + if (sendError) { + response.sendError(HttpServletResponse.SC_REQUEST_ENTITY_TOO_LARGE); + System.err.println("ERROR " + HttpServletResponse.SC_REQUEST_ENTITY= _TOO_LARGE + "request entity is larger than the server is willing or able t= o process."); + return; } else { - HttpSession session =3D httpRequest.getSession(); - synchronized (session) { - sessionsMap =3D (Map) session - .getAttribute(REQUESTS_SESSIONS_BEAN_NAME); - percentMap =3D (Map) session - .getAttribute(PERCENT_BEAN_NAME); - if (sessionsMap =3D=3D null) { - sessionsMap =3D Collections - .synchronizedMap(new HashMap()); - session.setAttribute( - REQUESTS_SESSIONS_BEAN_NAME, - sessionsMap); - } - if (percentMap =3D=3D null) { - percentMap =3D new HashMap(); - session.setAttribute(PERCENT_BEAN_NAME, - percentMap); - } + printResponse(response, ""); + } + = + } else if (!checkFileCount(httpRequest)) { + printResponse(response, ""); + } else { + = + HttpSession session =3D httpRequest.getSession(); + synchronized (session) { + sessionsMap =3D (Map) session.getAttribut= e(REQUESTS_SESSIONS_BEAN_NAME); + percentMap =3D (Map) session.getAttribute(PERCENT_B= EAN_NAME); + if (sessionsMap =3D=3D null) { + sessionsMap =3D Collections.synchronizedMap(new HashMap()); + session.setAttribute(REQUESTS_SESSIONS_BEAN_NAME, sessionsMap); } - percentMap.put(uid, 0); // associate percent value with - // file - // entry uid - sessionsMap.put(uid, multipartRequest); - = - if (multipartRequest.parseRequest()) { - = - xmlFilter.setMimetype("text/html"); // We need set mimetype as HTM= L to avoid - // transforming response to XML tree under IE = = - handleRequest(multipartRequest, response, chain); - } else { - printResponse(response, - ""); + if (percentMap =3D=3D null) { + percentMap =3D new HashMap(); + session.setAttribute(PERCENT_BEAN_NAME, percentMap); } } - } finally { - if (sessionsMap !=3D null) { - xmlFilter.setMimetype(mimeType); // Backup mimetype - sessionsMap.remove(uid); - percentMap.remove(uid); + = + /* associate percent value with file entry uid */ = + percentMap.put(uid, 0); + sessionsMap.put(uid, multipartRequest); + = + if (multipartRequest.parseRequest()) { + /*We need set mimetype as HTML to avoid transforming response to XML t= ree under IE */ + xmlFilter.setMimetype("text/html"); = + handleRequest(multipartRequest, response, chain); + } else { + printResponse(response, ""); } + = } - } else { - if ("stop".equals(httpRequest.getParameter("action"))) { - HttpSession session =3D httpRequest.getSession(); - Map sessions =3D (Map) session - .getAttribute(REQUESTS_SESSIONS_BEAN_NAME); + = + } finally { + = + if (sessionsMap !=3D null) { + String mimeType =3D xmlFilter.getMimetype(); + xmlFilter.setMimetype(mimeType); // Backup mimetype + sessionsMap.remove(uid); + percentMap.remove(uid); + } + = + } + } else { + = + if ("richfaces_file_upload_action_stop".equals(httpRequest.getParameter(= "action"))) { + HttpSession session =3D httpRequest.getSession(); + Map sessions =3D (Map) session.getAttribute(REQUESTS_SESSIONS_BEAN_NAME); = - if (sessions !=3D null) { - MultipartRequest multipartRequest =3D sessions.get(uid); - if (multipartRequest !=3D null) { - multipartRequest.stop(); - HttpServletResponse httpResponse =3D (HttpServletResponse) response; - httpResponse - .setStatus(HttpServletResponse.SC_OK); - httpResponse.getOutputStream().close(); - } + if (sessions !=3D null) { + MultipartRequest multipartRequest =3D sessions.get(uid); + if (multipartRequest !=3D null) { + multipartRequest.stop(); + handleRequest(request, response, chain); } - = - //TODO what's here? - } else { - handleRequest(request, response, chain); } + = + } else { + handleRequest(request, response, chain); } - } else { - handleRequest(request, response, chain); } + } else { + handleRequest(request, response, chain); } + } = /** * @param httpServletRequest --===============9196032037897817756==--