commit f32e187c8566743af6764419192457f63adb0a02
author Neil Fuller <nfuller@google.com> Tue Apr 10 17:35:42 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 10 17:35:42 2018 +0000
tree 53f70e19856d4c19269519a97b60b991c9fe0201
parent 382bdddf5333e6c5699e9192c88b08066a741d56
parent 68997dc82c20258a27ee1a33642e0275abda272a

Merge "Avoid a spurious NullPointerException in java.net.Inet6AddressImpl#icmpEcho" into pi-dev

ojluni/src/main/java/java/net/Inet6AddressImpl.java

diff --git a/ojluni/src/main/java/java/net/Inet6AddressImpl.java b/ojluni/src/main/java/java/net/Inet6AddressImpl.java
index cfc2d13..1edfe34 100644
--- a/ojluni/src/main/java/java/net/Inet6AddressImpl.java
+++ b/ojluni/src/main/java/java/net/Inet6AddressImpl.java
@@ -290,9 +290,11 @@
         } catch (IOException e) {
             // Silently ignore and fall back.
         } finally {
-            try {
-                Libcore.os.close(fd);
-            } catch (ErrnoException e) { }
+            if (fd != null) {
+                try {
+                    Libcore.os.close(fd);
+                } catch (ErrnoException e) { }
+            }
         }
 
         return false;