From 34ace4a41ae76cab5f4f2e9ea63450c0298695df Mon Sep 17 00:00:00 2001 From: Xue-Lei Andrew Fan Date: Mon, 14 Apr 2014 13:40:45 +0000 Subject: [PATCH] 8040062: Need to add new methods in BaseSSLSocketImpl Reviewed-by: mullan --- .../sun/security/ssl/BaseSSLSocketImpl.java | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/jdk/src/share/classes/sun/security/ssl/BaseSSLSocketImpl.java b/jdk/src/share/classes/sun/security/ssl/BaseSSLSocketImpl.java index 240bc052d47..d816a580ae4 100644 --- a/jdk/src/share/classes/sun/security/ssl/BaseSSLSocketImpl.java +++ b/jdk/src/share/classes/sun/security/ssl/BaseSSLSocketImpl.java @@ -28,6 +28,7 @@ package sun.security.ssl; import java.io.*; import java.nio.channels.SocketChannel; import java.net.*; +import java.util.Set; import javax.net.ssl.*; @@ -634,6 +635,34 @@ abstract class BaseSSLSocketImpl extends SSLSocket { } } + @Override + public Socket setOption(SocketOption name, + T value) throws IOException { + if (self == this) { + return super.setOption(name, value); + } else { + return self.setOption(name, value); + } + } + + @Override + public T getOption(SocketOption name) throws IOException { + if (self == this) { + return super.getOption(name); + } else { + return self.getOption(name); + } + } + + @Override + public Set> supportedOptions() { + if (self == this) { + return super.supportedOptions(); + } else { + return self.supportedOptions(); + } + } + boolean isLayered() { return (self != this); }