svn commit: r996011 - in /shindig/trunk/java/gadgets/src: main/java/org/apache/shindig/gadgets/http/BasicHttpFetcher.java test/java/org/apache/shindig/gadgets/http/BasicHttpFetcherTest.java

[li...@apache.org]

Author: lindner
Date: Fri Sep 10 22:41:17 2010
New Revision: 996011

URL: http://svn.apache.org/viewvc?rev=996011&view=rev
Log:
SHINDIG-1425 | Patch from Janusz Dziemidowicz | HTTP HEAD support broken when shindig.http.client.max-object-size-bytes is set to something other than zero

Modified:
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/BasicHttpFetcher.java
    shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/BasicHttpFetcherTest.java

Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/BasicHttpFetcher.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/BasicHttpFetcher.java?rev=996011&r1=996010&r2=996011&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/BasicHttpFetcher.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/BasicHttpFetcher.java Fri Sep 10 22:41:17 2010
@@ -461,7 +461,7 @@ public class BasicHttpFetcher implements
 
     HttpEntity entity = response.getEntity();
 
-    if (maxObjSize > 0 && entity.getContentLength() > maxObjSize) {
+    if (maxObjSize > 0 && entity != null && entity.getContentLength() > maxObjSize) {
       return HttpResponse.badrequest("Exceeded maximum number of bytes - " + maxObjSize);
     }
 

Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/BasicHttpFetcherTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/BasicHttpFetcherTest.java?rev=996011&r1=996010&r2=996011&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/BasicHttpFetcherTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/BasicHttpFetcherTest.java Fri Sep 10 22:41:17 2010
@@ -176,4 +176,21 @@ public class BasicHttpFetcherTest {
     }
     EasyMock.verify(mockEntity, mockInputStream);
   }
+  
+  /*
+   * https://issues.apache.org/jira/browse/SHINDIG-1425
+   */
+  @Test
+  public void testHeadWithMaxObjectSizeBytes() throws Exception {
+	fetcher.setMaxObjectSizeBytes(1024 * 1024);
+    Uri uri = new UriBuilder(Uri.parse("http://www.google.com/search"))
+        .addQueryParameter("body", "")
+        .addQueryParameter("status", "200")
+        .toUri();
+    HttpRequest request = new HttpRequest(uri);
+    request.setMethod("HEAD");
+    HttpResponse response = fetcher.fetch(request);
+    assertEquals(200, response.getHttpStatusCode());
+    assertEquals("", response.getResponseAsString());
+  }
 }