[Httpunit-commit] CVS: httpunit/src/com/meterware/servletunit ServletUnitHttpRequest.java,1.11,1.12

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

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

Modified Files:
	ServletUnitHttpRequest.java 
Log Message:
Return entire content-type header in getContentType

Index: ServletUnitHttpRequest.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/servletunit/ServletUnitHttpRequest.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ServletUnitHttpRequest.java	20 May 2002 16:00:13 -0000	1.11
+++ ServletUnitHttpRequest.java	21 May 2002 13:57:56 -0000	1.12
@@ -64,7 +64,7 @@
         _headers.addEntries( clientHeaders );
         _headers.addEntries( request.getHeaders() );
         _messageBody = messageBody;
-        readContentTypeHeader();
+        _contentType = (String) _headers.get( "Content-Type" );
         if (context == null) throw new IllegalArgumentException( "Context must not be null" );
 
         String file = request.getURL().getFile();
@@ -75,14 +75,6 @@
                 loadParameters( request.getQueryString() );
                 loadParameters( new String( _messageBody ) );
             }
-        }
-    }
-
-
-    private void readContentTypeHeader() {
-        _contentType = (String) _headers.get( "Content-Type" );
-        if (_contentType != null && _contentType.indexOf( ';' ) >= 0) {
-            _contentType = _contentType.substring( 0, _contentType.indexOf( ';' ) );
         }
     }