You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by ga...@apache.org on 2011/03/30 17:00:24 UTC

svn commit: r1086977 - /shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponseBuilder.java

Author: gagan
Date: Wed Mar 30 15:00:23 2011
New Revision: 1086977

URL: http://svn.apache.org/viewvc?rev=1086977&view=rev
Log:
Patched from atulvasu's cl | Issue 4331042: Default value fix in HttpResponseBuilder | http://codereview.appspot.com/4331042/diff/10001/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponseBuilder.java

Modified:
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponseBuilder.java

Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponseBuilder.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponseBuilder.java?rev=1086977&r1=1086976&r2=1086977&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponseBuilder.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponseBuilder.java Wed Mar 30 15:00:23 2011
@@ -22,6 +22,8 @@ import com.google.common.collect.Immutab
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Multimap;
+import com.google.inject.Inject;
+import com.google.inject.name.Named;
 
 import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang.StringUtils;
@@ -53,10 +55,8 @@ public class HttpResponseBuilder extends
   private HttpResponse responseObj;
   private int responseObjNumChanges;
 
-  /**
-   * @see {AbstractHttpCache.refetchStrictNoCacheAfterMs}
-   */
-  private long refetchStrictNoCacheAfterMs = -1;
+  private long refetchStrictNoCacheAfterMs =
+      AbstractHttpCache.REFETCH_STRICT_NO_CACHE_AFTER_MS_DEFAULT;
 
   public HttpResponseBuilder(GadgetHtmlParser parser, HttpResponse response) {
     super(parser, response);
@@ -71,7 +71,7 @@ public class HttpResponseBuilder extends
     responseObj = response;
     responseObjNumChanges = getNumChanges();
   }
-  
+
   public HttpResponseBuilder() {
     this(unsupportedParser(), null);
   }
@@ -167,7 +167,7 @@ public class HttpResponseBuilder extends
     }
     return this;
   }
-  
+
   public HttpResponseBuilder clearAllHeaders() {
     incrementNumChanges();
     headers.clear();
@@ -283,7 +283,7 @@ public class HttpResponseBuilder extends
     incrementNumChanges();
     return this;
   }
-  
+
   public int getContentLength() {
     return getResponse().length;
   }
@@ -295,7 +295,7 @@ public class HttpResponseBuilder extends
   Map<String, String> getMetadata() {
     return metadata;
   }
-  
+
   byte[] getResponse() {
     // Supported to avoid copying data unnecessarily.
     return getRawContentBytes();
@@ -319,12 +319,12 @@ public class HttpResponseBuilder extends
   @Override
   protected void setContentBytesState(byte[] newBytes, Charset newEncoding) {
     super.setContentBytesState(newBytes, newEncoding);
-    
+
     // Set the new encoding of the raw bytes, in order to ensure that
     // Content-Type headers are in sync w/ the content's encoding.
     if (newEncoding != null) setEncoding(newEncoding);
   }
-  
+
   private static GadgetHtmlParser unsupportedParser() {
     return new GadgetHtmlParser(null) {
       @Override