Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'bc06158a78297747605981702c8e41956ea1aa2d':
  Check for null in LocalSocketImpl.SocketInputStream.available()
This commit is contained in:
Jeff Sharkey
2014-05-21 16:05:34 +00:00
committed by Android Git Automerger
parent e77a77d081 bc06158a78
commit 9ef2117f0e
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/net/LocalSocketImpl.java
View File

@@ -56,7 +56,10 @@ class LocalSocketImpl
/** {@inheritDoc} */ /** {@inheritDoc} */
@Override @Override
public int available() throws IOException { 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} */ /** {@inheritDoc} */