svn commit: r662351 - in /incubator/shindig/trunk/java/gadgets/src: main/java/org/apache/shindig/gadgets/http/HttpResponse.java test/java/org/apache/shindig/gadgets/http/HttpResponseTest.java

[etnu]

Author: etnu
Date: Mon Jun  2 00:43:23 2008
New Revision: 662351

URL: http://svn.apache.org/viewvc?rev=662351&view=rev
Log:
Stripped null header keys from responses.


Modified:
    
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponse.java
    
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpResponseTest.java

Modified: 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponse.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponse.java?rev=662351&r1=662350&r2=662351&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponse.java
 (original)
+++ 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponse.java
 Mon Jun  2 00:43:23 2008
@@ -94,8 +94,10 @@
     Map<String, List<String>> tmpHeaders = new HashMap<String, List<String>>();
     if (headers != null) {
       for (Map.Entry<String, List<String>> entry : headers.entrySet()) {
-        List<String> newList = new ArrayList<String>(entry.getValue());
-        tmpHeaders.put(entry.getKey(), Collections.unmodifiableList(newList));
+        if (entry.getKey() != null && entry.getValue() != null) {
+          List<String> newList = new ArrayList<String>(entry.getValue());
+          tmpHeaders.put(entry.getKey(), 
Collections.unmodifiableList(newList));
+        }
       }
     }
     // Force Date header.

Modified: 
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpResponseTest.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpResponseTest.java?rev=662351&r1=662350&r2=662351&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpResponseTest.java
 (original)
+++ 
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpResponseTest.java
 Mon Jun  2 00:43:23 2008
@@ -128,4 +128,10 @@
     assertTrue("Bad HTTP responses must be cacheable!",
         HttpResponse.timeout().getCacheExpiration() > 
System.currentTimeMillis());
   }
+
+  public void testNullHeaderNamesStripped() {
+    addHeader(null, "dummy");
+    HttpResponse response = new HttpResponse(200, new byte[0], headers);
+    assertFalse("Null header not removed.", 
response.getAllHeaders().containsKey(null));
+  }
 }