am 2feafeff: Merge "Fix a problem with leaking UDP sockets." into kraken

2010-06-09 14:50:10 -07:00
parent f7b7915192 2feafeffb8
commit 69b04a7075
1 changed files with 6 additions and 1 deletions
--- a/services/java/com/android/server/WifiWatchdogService.java
+++ b/services/java/com/android/server/WifiWatchdogService.java
@@ -1217,8 +1217,9 @@ public class WifiWatchdogService {
        private static Random sRandom = new Random();
        
        static boolean isDnsReachable(int dns, int timeout) {
+            DatagramSocket socket = null;
            try {
-                DatagramSocket socket = new DatagramSocket();
+                socket = new DatagramSocket();
                
                // Set some socket properties
                socket.setSoTimeout(timeout);
@@ -1271,6 +1272,10 @@ public class WifiWatchdogService {
                    Slog.d(TAG, "DnsPinger.isReachable got an unknown exception", e);
                }
                return false;
+            } finally {
+                if (socket != null) {
+                    socket.close();
+                }
            }
        }