[cvs] expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller Controller.java

[JCorporate Ltd]

Update of /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller
In directory jcorp2.servlets.net:/tmp/cvs-serv14700

Modified Files:
	Controller.java 
Log Message:
Moved clearing of multipart request handler for session beans so that it will be cleared when an exception occurs in processing the state.


Index: Controller.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/Controller.java,v
retrieving revision 1.90
retrieving revision 1.91
diff -C2 -d -r1.90 -r1.91
*** Controller.java	22 May 2004 02:18:23 -0000	1.90
--- Controller.java	4 Jul 2004 18:19:27 -0000	1.91
***************
*** 1871,1875 ****
              // ============================================================
              // ============================================================
!             ControllerResponse res = newState(StringUtil.notNull(requestedState), req);
              if (log.isDebugEnabled()) {
                  log.debug("After newstate in '" + getClass().getName() +
--- 1871,1888 ----
              // ============================================================
              // ============================================================
!             ControllerResponse res = null;
!             try {
!                 res = newState(StringUtil.notNull(requestedState), req);
!             } finally {
!                 if (form != null && "session".equals(mapping.getScope())) {
!                     // Here is a fix for multipart action form beans that
!                     // are "session" scoped.  We need to reset the
!                     // multipart request handler for these beans in order
!                     // to prevent infinite looping in the Controller's
!                     // transition mechanism.
!                     form.setMultipartRequestHandler(/*MultipartRequestHandler*/ null);
!                 }
!             }
! 
              if (log.isDebugEnabled()) {
                  log.debug("After newstate in '" + getClass().getName() +
***************
*** 1880,1892 ****
              res.setRequestPath(mapping.getPath());
              request.setAttribute(ExpressoConstants.CONTROLLER_RESPONSE_KEY, res);
- 
-             if (form != null && "session".equals(mapping.getScope())) {
-                 // Here is a fix for multipart action form beans that
-                 // are "session" scoped.  We need to reset the
-                 // multipart request handler for these beans in order
-                 // to prevent infinite looping in the Controller's
-                 // transition mechanism.
-                 form.setMultipartRequestHandler(/*MultipartRequestHandler*/ null);
-             }
  
              // Has the controller state method declared a custom
--- 1893,1896 ----