svn commit: r680906 - /incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponse.java

[lryan]

Author: lryan
Date: Tue Jul 29 19:39:14 2008
New Revision: 680906

URL: http://svn.apache.org/viewvc?rev=680906&view=rev
Log:
Fix for test failure when no content is provided

Modified:
    
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponse.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=680906&r1=680905&r2=680906&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
 Tue Jul 29 19:39:14 2008
@@ -158,11 +158,7 @@
 
     this.metadata = new HashMap<String, String>();
     if (encoding == null) {
-      if (responseBytes != null && responseBytes.length > 0) {
-        this.encoding = detectEncoding();
-      } else {
-        this.encoding = Charset.defaultCharset().name();
-      }
+      this.encoding = detectEncoding();
     } else {
       this.encoding = encoding;
     }
@@ -233,6 +229,9 @@
       }
     }
 
+    if (responseBytes == null || responseBytes.length == 0) {
+      return Charset.defaultCharset().name();
+    }
     // If the header doesn't specify the charset, try to determine it by 
examining the content.
     CharsetDetector detector = new CharsetDetector();
     detector.setText(responseBytes);