Merge "Check for null in LocalSocketImpl.SocketInputStream.available()"

2014-05-21 16:03:08 +00:00
parent ec71fed089 54d50089ee
commit bc06158a78
1 changed files with 4 additions and 1 deletions
--- a/core/java/android/net/LocalSocketImpl.java
+++ b/core/java/android/net/LocalSocketImpl.java
@@ -56,7 +56,10 @@ class LocalSocketImpl
        /** {@inheritDoc} */
        @Override
        public int available() throws IOException {
-            return available_native(fd);
+            FileDescriptor myFd = fd;
+            if (myFd == null) throw new IOException("socket closed");
+
+            return available_native(myFd);
        }

        /** {@inheritDoc} */