Revision: 519
          http://svn.sourceforge.net/stripes/?rev=519&view=rev
Author:   tfenne
Date:     2007-04-03 16:08:12 -0700 (Tue, 03 Apr 2007)

Log Message:
-----------
Fixed a bug where the FlashRequest wrapping would have problems with a 
mime/multipart request.

Modified Paths:
--------------
    
branches/1.4.x/stripes/src/net/sourceforge/stripes/controller/FlashRequest.java
    
branches/1.4.x/stripes/src/net/sourceforge/stripes/controller/FlashScope.java

Modified: 
branches/1.4.x/stripes/src/net/sourceforge/stripes/controller/FlashRequest.java
===================================================================
--- 
branches/1.4.x/stripes/src/net/sourceforge/stripes/controller/FlashRequest.java 
    2007-04-02 14:55:11 UTC (rev 518)
+++ 
branches/1.4.x/stripes/src/net/sourceforge/stripes/controller/FlashRequest.java 
    2007-04-03 23:08:12 UTC (rev 519)
@@ -70,15 +70,25 @@
     private int remotePort;
     private int serverPort;
     
-    public static StripesRequestWrapper wrapRequest(HttpServletRequest 
request) {
-        try {
-            return new StripesRequestWrapper(new FlashRequest(request));
-        }
-        catch (StripesServletException e) {
-            throw new StripesRuntimeException(e);
-        }
+       /**
+        * Finds the StripesRequestWrapper for the supplied request and swaps 
out the underlying
+        * request for an instance of FlashRequest.
+        *
+        * @param request the current HttpServletRequest
+        * @return the StripesRequestWrapper for this request with the "live" 
request replaced
+        */
+    public static StripesRequestWrapper replaceRequest(HttpServletRequest 
request) {
+        StripesRequestWrapper wrapper = 
StripesRequestWrapper.findStripesWrapper(request);
+        wrapper.setRequest(new FlashRequest((HttpServletRequest) 
wrapper.getRequest()));
+        return wrapper;
     }
 
+    /**
+     * Creates a new FlashRequest by copying all appropriate attributes from 
the prototype
+     * request supplied.
+     *
+     * @param prototype the HttpServletRequest to create a disconnected copy of
+     */
     @SuppressWarnings({ "unchecked", "deprecation" })
     public FlashRequest(HttpServletRequest prototype) {
         // copy properties

Modified: 
branches/1.4.x/stripes/src/net/sourceforge/stripes/controller/FlashScope.java
===================================================================
--- 
branches/1.4.x/stripes/src/net/sourceforge/stripes/controller/FlashScope.java   
    2007-04-02 14:55:11 UTC (rev 518)
+++ 
branches/1.4.x/stripes/src/net/sourceforge/stripes/controller/FlashScope.java   
    2007-04-03 23:08:12 UTC (rev 519)
@@ -162,7 +162,7 @@
 
         // Replace the request and response objects for the request cycle that 
is ending
         // with objects that are safe to use on the ensuing request.
-        HttpServletRequest flashRequest = FlashRequest.wrapRequest(request);
+        HttpServletRequest flashRequest = FlashRequest.replaceRequest(request);
         HttpServletResponse flashResponse = (HttpServletResponse) 
Proxy.newProxyInstance(
                 getClass().getClassLoader(),
                 new Class<?>[] { HttpServletResponse.class },


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Stripes-development mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/stripes-development

Reply via email to