[Httpunit-commit] CVS: httpunit/src/com/meterware/servletunit ServletInputStreamImpl.java,NONE,1.1 ServletUnitHttpRequest.java,1.10,1.11

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

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

Modified Files:
	ServletUnitHttpRequest.java 
Added Files:
	ServletInputStreamImpl.java 
Log Message:
Implemented access to request message body

***** Error reading new file[Errno 2] No such file or directory: 'ServletInputStreamImpl.java'
Index: ServletUnitHttpRequest.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/servletunit/ServletUnitHttpRequest.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ServletUnitHttpRequest.java	1 Mar 2002 06:08:24 -0000	1.10
+++ ServletUnitHttpRequest.java	20 May 2002 16:00:13 -0000	1.11
@@ -50,6 +50,9 @@
  **/
 class ServletUnitHttpRequest implements HttpServletRequest {
 
+    private ServletInputStreamImpl _inputStream;
+    private String                 _contentType;
+
 
     /**
      * Constructs a ServletUnitHttpRequest from a WebRequest object.
@@ -61,14 +64,14 @@
         _headers.addEntries( clientHeaders );
         _headers.addEntries( request.getHeaders() );
         _messageBody = messageBody;
+        readContentTypeHeader();
         if (context == null) throw new IllegalArgumentException( "Context must not be null" );
 
         String file = request.getURL().getFile();
         if (file.indexOf( '?' ) >= 0) {
             loadParameters( file.substring( file.indexOf( '?' )+1 ) );
         } else {
-            final Object contentType = _headers.get( "Content-Type" );
-            if (contentType == null || contentType.toString().indexOf( "x-www-form-urlencoded" ) >= 0 ) {
+            if (_contentType == null || _contentType.indexOf( "x-www-form-urlencoded" ) >= 0 ) {
                 loadParameters( request.getQueryString() );
                 loadParameters( new String( _messageBody ) );
             }
@@ -76,6 +79,14 @@
     }
 
 
+    private void readContentTypeHeader() {
+        _contentType = (String) _headers.get( "Content-Type" );
+        if (_contentType != null && _contentType.indexOf( ';' ) >= 0) {
+            _contentType = _contentType.substring( 0, _contentType.indexOf( ';' ) );
+        }
+    }
+
+
 //----------------------------------------- HttpServletRequest methods --------------------------
     
 
@@ -333,8 +344,10 @@
      *
      */
     public ServletInputStream getInputStream() throws IOException {
-        throwNotImplementedYet();
-        return null;
+        if (_inputStream == null) {
+            _inputStream = new ServletInputStreamImpl( _messageBody );
+        }
+        return _inputStream;
     }
 
 
@@ -369,7 +382,7 @@
      * of the CGI variable CONTENT_TYPE.
      **/
     public String getContentType() {
-        return null;
+        return _contentType;
     }