Commit 0648ecb2 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Return real FileDescriptor in Socket wrappers.

In classes that wrap another Socket, return the real FileDescriptor
from the wrapped Socket.

Bug: 5189186
Change-Id: I157feb6991def9110eaf0ea82365b6f5b95b9372
parent 8243abdb
......@@ -18,6 +18,8 @@ package org.apache.harmony.xnet.provider.jsse;
import dalvik.system.BlockGuard;
import dalvik.system.CloseGuard;
import java.io.FileDescriptor;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
......@@ -984,4 +986,13 @@ public class OpenSSLSocketImpl
super.finalize();
}
}
@Override
public FileDescriptor getFileDescriptor$() {
if (socket == this) {
return super.getFileDescriptor$();
} else {
return socket.getFileDescriptor$();
}
}
}
......@@ -17,6 +17,7 @@
package org.apache.harmony.xnet.provider.jsse;
import java.io.FileDescriptor;
import java.io.IOException;
import java.net.InetAddress;
import java.net.Socket;
......@@ -219,6 +220,11 @@ public class SSLSocketWrapper extends SSLSocketImpl {
return socket.getLocalPort();
}
@Override
public FileDescriptor getFileDescriptor$() {
return socket.getFileDescriptor$();
}
// -------------------------------------------------------------------
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment