commit 329e04abc866ee246d0f53e57bfbdbda6a4800e1
author Robert Greenwalt <rgreenwalt@google.com> Wed Sep 01 16:18:01 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 01 16:18:01 2010 -0700
tree 36822b5059589d7a432c5c48f68b17921759bf24
parent 94daa185b8fae7319c7a8e43980bc9c8171fd5e3
parent e422ad9819f4e79c286fd0d2202db450776f3705

Merge "Fix NPE in toString"

core/java/android/net/ProxyProperties.java

diff --git a/core/java/android/net/ProxyProperties.java b/core/java/android/net/ProxyProperties.java
index 17d0ec0..bce7ec0 100644
--- a/core/java/android/net/ProxyProperties.java
+++ b/core/java/android/net/ProxyProperties.java
@@ -75,8 +75,12 @@
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
-        sb.append(mProxy.getHostAddress()).append(":").append(mPort)
-          .append(" xl=").append(mExclusionList);
+        if (mProxy != null) {
+            sb.append(mProxy.getHostAddress()).append(":").append(mPort);
+            if (mExclusionList != null) {
+                    sb.append(" xl=").append(mExclusionList);
+            }
+        }
         return sb.toString();
     }