Port some fixes

Author: jfarcand

src/main/java/com/ning/http/client/RequestBuilderBase.java

@@ -95,7 +95,7 @@ public RequestImpl(Request prototype) {
                 this.proxyServer = prototype.getProxyServer();
                 this.realm = prototype.getRealm();
                 this.file = prototype.getFile();
-                this.followRedirects = prototype.isRedirectOverrideSet()? prototype.isRedirectEnabled() : null;
+                this.followRedirects = prototype.isRedirectOverrideSet() ? prototype.isRedirectEnabled() : null;
                 this.perRequestConfig = prototype.getPerRequestConfig();
                 this.rangeOffset = prototype.getRangeOffset();
                 this.charset = prototype.getBodyEncoding();
@@ -126,7 +126,7 @@ public InetAddress getInetAddress() {
         public InetAddress getLocalAddress() {
             return localAddress;
         }
-        
+
         private String toUrl(boolean encode) {
 
             if (url == null) {
@@ -271,7 +271,7 @@ public boolean isRedirectEnabled() {
             return (followRedirects != null && followRedirects);
         }
 
-        public boolean isRedirectOverrideSet(){
+        public boolean isRedirectOverrideSet() {
             return followRedirects != null;
         }
 
@@ -294,18 +294,22 @@ public String toString() {
             sb.append("\t");
             sb.append(method);
             sb.append("\theaders:");
-            for (String name : headers.keySet()) {
-                sb.append("\t");
-                sb.append(name);
-                sb.append(":");
-                sb.append(headers.getJoinedValue(name, ", "));
+            if (headers != null && !headers.isEmpty()) {
+                for (String name : headers.keySet()) {
+                    sb.append("\t");
+                    sb.append(name);
+                    sb.append(":");
+                    sb.append(headers.getJoinedValue(name, ", "));
+                }
             }
-            sb.append("\tparams:");
-            for (String name : params.keySet()) {
-                sb.append("\t");
-                sb.append(name);
-                sb.append(":");
-                sb.append(params.getJoinedValue(name, ", "));
+            if (params != null && !params.isEmpty()) {
+                sb.append("\tparams:");
+                for (String name : params.keySet()) {
+                    sb.append("\t");
+                    sb.append(name);
+                    sb.append(":");
+                    sb.append(params.getJoinedValue(name, ", "));
+                }
             }
 
             return sb.toString();
@@ -339,10 +343,10 @@ public T setUrl(String url) {
     }
 
     public T setInetAddress(InetAddress address) {
-    	request.address = address;
-    	return derived.cast(this);
+        request.address = address;
+        return derived.cast(this);
     }
-    
+
     public T setLocalInetAddress(InetAddress address) {
         request.localAddress = address;
         return derived.cast(this);