Refactor if statement

1 files changed, 13 insertions, 12 deletions

diff --git a/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/rpc/SimpleServer.java b/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/rpc/SimpleServer.java
index 40c32e7..54db8ae 100644
--- a/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/rpc/SimpleServer.java
+++ b/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/rpc/SimpleServer.java
@@ -138,19 +138,20 @@ public abstract class SimpleServer {
 
         InetAddress candidate = null;
         Enumeration<NetworkInterface> nets = NetworkInterface.getNetworkInterfaces();
-        if (nets != null) {
-            for (NetworkInterface netint : Collections.list(nets)) {
-                if (!netint.isLoopback() || !netint.isUp()) { // Ignore if localhost or not active
-                    continue;
-                }
-                Enumeration<InetAddress> addresses = netint.getInetAddresses();
-                for (InetAddress address : Collections.list(addresses)) {
-                    if (address instanceof Inet4Address) {
-                        Log.d("local address " + address);
-                        return address; // Prefer ipv4
-                    }
-                    candidate = address; // Probably an ipv6
+        if (nets == null) {
+            return InetAddress.getLocalHost(); // Return local host if no interfaces found.
+        }
+        for (NetworkInterface netint : Collections.list(nets)) {
+            if (!netint.isLoopback() || !netint.isUp()) { // Ignore if localhost or not active
+                continue;
+            }
+            Enumeration<InetAddress> addresses = netint.getInetAddresses();
+            for (InetAddress address : Collections.list(addresses)) {
+                if (address instanceof Inet4Address) {
+                    Log.d("local address " + address);
+                    return address; // Prefer ipv4
                 }
+                candidate = address; // Probably an ipv6
             }
         }
         if (candidate != null) {