[Httpunit-commit] CVS: httpunit/src/com/meterware/servletunit InvocationContextImpl.java,1.13,1.14 ServletUnitWebResponse.java,1.11,1.12

[Russell G. <rus...@us...>]

Update of /cvsroot/httpunit/httpunit/src/com/meterware/servletunit
In directory sc8-pr-cvs1:/tmp/cvs-serv11775/src/com/meterware/servletunit

Modified Files:
	InvocationContextImpl.java ServletUnitWebResponse.java 
Log Message:
#744214: ServletUnit does not recognize subframes

Index: InvocationContextImpl.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/servletunit/InvocationContextImpl.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- InvocationContextImpl.java	27 Feb 2003 23:36:02 -0000	1.13
+++ InvocationContextImpl.java	17 Jun 2003 23:23:02 -0000	1.14
@@ -98,7 +98,7 @@
                 cookie.setPath( _application.getContextPath() );
                 _response.addCookie( cookie );
             }
-            _webResponse = new ServletUnitWebResponse( _client, _target, _requestURL, _response );
+            _webResponse = new ServletUnitWebResponse( _client, _target, _requestURL, _response, _client.getExceptionsThrownOnErrorStatus() );
         }
         return _webResponse;
     }

Index: ServletUnitWebResponse.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/servletunit/ServletUnitWebResponse.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ServletUnitWebResponse.java	22 Aug 2002 15:48:41 -0000	1.11
+++ ServletUnitWebResponse.java	17 Jun 2003 23:23:02 -0000	1.12
@@ -24,6 +24,7 @@
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.net.URL;
+import java.net.HttpURLConnection;
 
 import javax.servlet.http.HttpServletResponse;
 
@@ -39,10 +40,25 @@
      * @param url the url from which the response was received
      * @param response the response populated by the servlet
      **/
-    ServletUnitWebResponse( ServletUnitClient client, String target, URL url, HttpServletResponse response ) throws IOException {
+    ServletUnitWebResponse( ServletUnitClient client, String target, URL url, HttpServletResponse response, boolean throwExceptionOnError ) throws IOException {
         super( client, target, url );
         _response = (ServletUnitHttpResponse) response;
-        defineRawInputStream( new ByteArrayInputStream( _response.getContents() ) );
+        /** make sure that any IO exception for HTML received page happens here, not later. **/
+        if (getResponseCode() < HttpURLConnection.HTTP_BAD_REQUEST || !throwExceptionOnError) {
+            defineRawInputStream( new ByteArrayInputStream( _response.getContents() ) );
+            if (getContentType().startsWith( "text" )) loadResponseText();
+        }
+    }
+
+
+    /**
+     * Constructs a response object from a servlet response.
+     * @param target the target frame on which the response will be displayed
+     * @param url the url from which the response was received
+     * @param response the response populated by the servlet
+     **/
+    ServletUnitWebResponse( ServletUnitClient client, String target, URL url, HttpServletResponse response ) throws IOException {
+        this( client, target, url, response, true );
     }