svn commit: r1341484 - in /shindig/trunk/java/gadgets/src: main/java/org/apache/shindig/gadgets/servlet/MakeRequestHandler.java test/java/org/apache/shindig/gadgets/servlet/MakeRequestHandlerTest.java

[ssievers]

Author: ssievers
Date: Tue May 22 14:07:41 2012
New Revision: 1341484

URL: http://svn.apache.org/viewvc?rev=1341484&view=rev
Log:
SHINDIG-1781 | makeRequest does not forward User-Agent | Patch from Adam 
Clarke.  Thanks!

Modified:
    
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/MakeRequestHandler.java
    
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/MakeRequestHandlerTest.java

Modified: 
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/MakeRequestHandler.java
URL: 
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/MakeRequestHandler.java?rev=1341484&r1=1341483&r2=1341484&view=diff
==============================================================================
--- 
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/MakeRequestHandler.java
 (original)
+++ 
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/MakeRequestHandler.java
 Tue May 22 14:07:41 2012
@@ -306,6 +306,13 @@ public class MakeRequestHandler implemen
       req.setSecurityToken(token);
     }
 
+    if (req.getHeader("User-Agent") == null) {
+      final String userAgent = request.getHeader("User-Agent");
+      if (userAgent != null) {
+        req.setHeader("User-Agent", userAgent);
+      }
+    }
+
     ServletUtil.setXForwardedForHeader(request, req);
     return req;
   }

Modified: 
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/MakeRequestHandlerTest.java
URL: 
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/MakeRequestHandlerTest.java?rev=1341484&r1=1341483&r2=1341484&view=diff
==============================================================================
--- 
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/MakeRequestHandlerTest.java
 (original)
+++ 
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/MakeRequestHandlerTest.java
 Tue May 22 14:07:41 2012
@@ -797,4 +797,20 @@ public class MakeRequestHandlerTest exte
 
     assertEquals(ContainerConfig.DEFAULT_CONTAINER, 
MakeRequestHandler.getContainer(request));
   }
+
+  @Test
+  public void testUserAgent() throws Exception {
+    HttpRequest expected = new 
HttpRequest(REQUEST_URL).addHeader("User-Agent", "ua");
+    expect(pipeline.execute(expected)).andReturn(new 
HttpResponse(RESPONSE_BODY));
+    expect(request.getHeader("User-Agent")).andReturn("ua");
+    replay();
+
+    handler.fetch(request, recorder);
+    verify();
+
+    JSONObject results = extractJsonFromResponse();
+    assertEquals(HttpResponse.SC_OK, results.getInt("rc"));
+    assertEquals(RESPONSE_BODY, results.get("body"));
+    assertTrue(rewriter.responseWasRewritten());
+  }
 }