[Httpunit-commit] CVS: httpunit/src/com/meterware/servletunit ServletUnitHttpSession.java,1.10,1.11 ServletUnitServletContext.java,1.13,1.14

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

Update of /cvsroot/httpunit/httpunit/src/com/meterware/servletunit
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20921/src/com/meterware/servletunit

Modified Files:
	ServletUnitHttpSession.java ServletUnitServletContext.java 
Log Message:
servlet unit patches: null session attribute, context mime types

Index: ServletUnitHttpSession.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/servletunit/ServletUnitHttpSession.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ServletUnitHttpSession.java	15 Feb 2004 06:42:01 -0000	1.10
+++ ServletUnitHttpSession.java	3 Mar 2004 01:12:51 -0000	1.11
@@ -175,7 +175,9 @@
     public void setAttribute( String name, Object value ) {
         if (_invalid) throw new IllegalStateException();
 
-        if (!_values.containsKey( name )) {
+        if (value == null) {
+            removeAttribute( name );
+        } else if (!_values.containsKey( name )) {
             _values.put( name, value );
             _listenerDispatcher.sendAttributeAdded( this, name, value );
         } else {

Index: ServletUnitServletContext.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/servletunit/ServletUnitServletContext.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ServletUnitServletContext.java	15 Feb 2004 06:42:01 -0000	1.13
+++ ServletUnitServletContext.java	3 Mar 2004 01:12:51 -0000	1.14
@@ -24,8 +24,9 @@
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 
-import java.net.URL;
 import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLConnection;
 
 import java.util.Enumeration;
 import java.util.Hashtable;
@@ -85,7 +86,7 @@
      * "text/html" and "image/gif".
      **/
     public java.lang.String getMimeType( String filePath ) {
-        return null;  // XXX not implemented
+        return URLConnection.getFileNameMap().getContentTypeFor(filePath);
     }