commit 6f6ef48dc9a40d6afe2b66db4d1a411771e85a5b
author Robert Greenwalt <robdroid@android.com> Wed Feb 02 13:31:48 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 02 13:31:48 2011 -0800
tree dc7eceb23ae262f4b3e4a4602270f3b220f0a05f
parent b709a85367bf4d1bacb7cf2ecacf75a2e07ff262
parent 045b166ac27c3b7a67993b029f03088042bf4d5a

Merge "Provide an empty List of dns servers, protecting against an NPE if the DHCP server omits the list of DNS servers from the DHCP-OFFER packet."

core/java/android/net/dhcp/DhcpPacket.java

diff --git a/core/java/android/net/dhcp/DhcpPacket.java b/core/java/android/net/dhcp/DhcpPacket.java
index e009f70..7d2bd69 100644
--- a/core/java/android/net/dhcp/DhcpPacket.java
+++ b/core/java/android/net/dhcp/DhcpPacket.java
@@ -561,7 +561,7 @@
         InetAddress nextIp;
         InetAddress relayIp;
         byte[] clientMac;
-        List<InetAddress> dnsServers = null;
+        List<InetAddress> dnsServers = new ArrayList<InetAddress>();
         InetAddress gateway = null; // aka router
         Integer leaseTime = null;
         InetAddress serverIdentifier = null;
@@ -684,7 +684,6 @@
                         expectedLen = 4;
                         break;
                     case DHCP_DNS_SERVER:
-                        dnsServers = new ArrayList<InetAddress>();
                         expectedLen = 0;
 
                         for (expectedLen = 0; expectedLen < optionLen;