svn commit: r881061 - in /felix/trunk/http/base/src: main/java/org/apache/felix/http/base/internal/context/ServletContextImpl.java test/java/org/apache/felix/http/base/internal/context/ServletContextImplTest.java

[srs]

Author: srs
Date: Mon Nov 16 23:54:11 2009
New Revision: 881061

URL: http://svn.apache.org/viewvc?rev=881061&view=rev
Log:
FELIX-1872: Fixed so that setAttribute is nullsafe

Modified:
    
felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/context/ServletContextImpl.java
    
felix/trunk/http/base/src/test/java/org/apache/felix/http/base/internal/context/ServletContextImplTest.java

Modified: 
felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/context/ServletContextImpl.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/context/ServletContextImpl.java?rev=881061&r1=881060&r2=881061&view=diff
==============================================================================
--- 
felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/context/ServletContextImpl.java
 (original)
+++ 
felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/context/ServletContextImpl.java
 Mon Nov 16 23:54:11 2009
@@ -149,7 +149,9 @@
 
     public void setAttribute(String name, Object value)
     {
-        this.attributes.put(name, value);
+        if ((name != null) && (value != null)) {
+            this.attributes.put(name, value);
+        }
     }
 
     public void removeAttribute(String name)

Modified: 
felix/trunk/http/base/src/test/java/org/apache/felix/http/base/internal/context/ServletContextImplTest.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/http/base/src/test/java/org/apache/felix/http/base/internal/context/ServletContextImplTest.java?rev=881061&r1=881060&r2=881061&view=diff
==============================================================================
--- 
felix/trunk/http/base/src/test/java/org/apache/felix/http/base/internal/context/ServletContextImplTest.java
 (original)
+++ 
felix/trunk/http/base/src/test/java/org/apache/felix/http/base/internal/context/ServletContextImplTest.java
 Mon Nov 16 23:54:11 2009
@@ -111,6 +111,9 @@
 
         this.context.removeAttribute("key1");
         Assert.assertNull(this.context.getAttribute("key1"));
+
+        this.context.setAttribute("key1", null);
+        Assert.assertNull(this.context.getAttribute("key1"));
     }
 
     @Test