Fix crash when proxy exclusion list is null.

Also cleaned up source a little bit and eliminated a warning.

Bug: 2964821
Change-Id: I35825bb345742ea1a1854e8998aa67e353deaa17
This commit is contained in:
Andrew Stadler
2010-08-31 14:28:58 -07:00
parent fd151ec69b
commit e55ada7892

View File

@@ -41,13 +41,17 @@ public class ProxyProperties implements Parcelable {
if (source != null) { if (source != null) {
mProxy = source.getAddress(); mProxy = source.getAddress();
mPort = source.getPort(); mPort = source.getPort();
mExclusionList = new String(source.getExclusionList()); String exclusionList = source.getExclusionList();
if (exclusionList != null) {
mExclusionList = new String(exclusionList);
}
} }
} }
public InetAddress getAddress() { public InetAddress getAddress() {
return mProxy; return mProxy;
} }
public void setAddress(InetAddress proxy) { public void setAddress(InetAddress proxy) {
mProxy = proxy; mProxy = proxy;
} }
@@ -55,6 +59,7 @@ public class ProxyProperties implements Parcelable {
public int getPort() { public int getPort() {
return mPort; return mPort;
} }
public void setPort(int port) { public void setPort(int port) {
mPort = port; mPort = port;
} }
@@ -62,6 +67,7 @@ public class ProxyProperties implements Parcelable {
public String getExclusionList() { public String getExclusionList() {
return mExclusionList; return mExclusionList;
} }
public void setExclusionList(String exclusionList) { public void setExclusionList(String exclusionList) {
mExclusionList = exclusionList; mExclusionList = exclusionList;
} }
@@ -121,5 +127,4 @@ public class ProxyProperties implements Parcelable {
return new ProxyProperties[size]; return new ProxyProperties[size];
} }
}; };
}
};