I'd like some comment before committing this. An FC bug report led to this note:
http://www.mail-archive.com/[email protected]/msg00059.html This patch is simply the same thing, applied to Classpath. Any reason this should not go in? Tom Index: ChangeLog from Tom Tromey <[EMAIL PROTECTED]> * gnu/javax/net/ssl/provider/SSLSocket.java (isBound, isClosed, isConnected): Removed old comment. (getRemoteSocketAddress): Uncommented. (setOOBInline, getOOBInline, setKeepAlive, getKeepAlive, setTrafficClass, getTrafficClass, setReuseAddress, getReuseAddress, shutdownInput, shutdownOutput, isInputShutdown, isOutputShutdown): Uncommented. Index: gnu/javax/net/ssl/provider/SSLSocket.java =================================================================== RCS file: /cvsroot/classpath/classpath/gnu/javax/net/ssl/provider/SSLSocket.java,v retrieving revision 1.1 diff -u -r1.1 SSLSocket.java --- gnu/javax/net/ssl/provider/SSLSocket.java 26 Jan 2006 02:25:11 -0000 1.1 +++ gnu/javax/net/ssl/provider/SSLSocket.java 18 Sep 2006 17:43:44 -0000 @@ -845,7 +845,6 @@ { return super.isBound(); } - //throw new UnsupportedOperationException("1.4 methods not enabled"); } public boolean isClosed() @@ -858,149 +857,138 @@ { return super.isClosed(); } - //throw new UnsupportedOperationException("1.4 methods not enabled"); } - //public SocketAddress getRemoteSocketAddress() - //{ - // if (underlyingSocket != null) - // { - // return underlyingSocket.getRemoteSocketAddress(); - // } - // else - // { - // return super.getRemoteSocketAddress(); - // } - //} + public SocketAddress getRemoteSocketAddress() + { + if (underlyingSocket != null) + { + return underlyingSocket.getRemoteSocketAddress(); + } + else + { + return super.getRemoteSocketAddress(); + } + } public void setOOBInline(boolean flag) throws SocketException { - //if (underlyingSocket != null) - // { - // underlyingSocket.setOOBInline(flag); - // } - //else - // { - // super.setOOBInline(flag); - // } - throw new UnsupportedOperationException("1.4 methods not enabled"); + if (underlyingSocket != null) + { + underlyingSocket.setOOBInline(flag); + } + else + { + super.setOOBInline(flag); + } } public boolean getOOBInline() throws SocketException { - //if (underlyingSocket != null) - // { - // return underlyingSocket.getOOBInline(); - // } - //else - // { - // return super.getOOBInline(); - // } - throw new UnsupportedOperationException("1.4 methods not enabled"); + if (underlyingSocket != null) + { + return underlyingSocket.getOOBInline(); + } + else + { + return super.getOOBInline(); + } } public void setKeepAlive(boolean flag) throws SocketException { - //if (underlyingSocket != null) - // { - // underlyingSocket.setKeepAlive(flag); - // } - //else - // { - // super.setKeepAlive(flag); - // } - throw new UnsupportedOperationException("1.4 methods not enabled"); + if (underlyingSocket != null) + { + underlyingSocket.setKeepAlive(flag); + } + else + { + super.setKeepAlive(flag); + } } public boolean getKeepAlive() throws SocketException { - //if (underlyingSocket != null) - // { - // return underlyingSocket.getKeepAlive(); - // } - //else - // { - // return super.getKeepAlive(); - // } - throw new UnsupportedOperationException("1.4 methods not enabled"); + if (underlyingSocket != null) + { + return underlyingSocket.getKeepAlive(); + } + else + { + return super.getKeepAlive(); + } } public void setTrafficClass(int clazz) throws SocketException { - //if (underlyingSocket != null) - // { - // underlyingSocket.setTrafficClass(clazz); - // } - //else - // { - // super.setTrafficClass(clazz); - // } - throw new UnsupportedOperationException("1.4 methods not enabled"); + if (underlyingSocket != null) + { + underlyingSocket.setTrafficClass(clazz); + } + else + { + super.setTrafficClass(clazz); + } } public int getTrafficClass() throws SocketException { - //if (underlyingSocket != null) - // { - // return underlyingSocket.getTrafficClass(); - // } - //else - // { - // return super.getTrafficClass(); - // } - throw new UnsupportedOperationException("1.4 methods not enabled"); + if (underlyingSocket != null) + { + return underlyingSocket.getTrafficClass(); + } + else + { + return super.getTrafficClass(); + } } public void setReuseAddress(boolean flag) throws SocketException { - //if (underlyingSocket != null) - // { - // underlyingSocket.setReuseAddress(flag); - // } - //else - // { - // super.setReuseAddress(flag); - // } - throw new UnsupportedOperationException("1.4 methods not enabled"); + if (underlyingSocket != null) + { + underlyingSocket.setReuseAddress(flag); + } + else + { + super.setReuseAddress(flag); + } } public boolean getReuseAddress() throws SocketException { - //if (underlyingSocket != null) - // { - // return underlyingSocket.getReuseAddress(); - // } - //else - // { - // return super.getReuseAddress(); - // } - throw new UnsupportedOperationException("1.4 methods not enabled"); + if (underlyingSocket != null) + { + return underlyingSocket.getReuseAddress(); + } + else + { + return super.getReuseAddress(); + } } public void shutdownInput() throws IOException { - //if (underlyingSocket != null) - // { - // underlyingSocket.shutdownInput(); - // } - //else - // { - // super.shutdownInput(); - // } - throw new UnsupportedOperationException("1.4 methods not enabled"); + if (underlyingSocket != null) + { + underlyingSocket.shutdownInput(); + } + else + { + super.shutdownInput(); + } } public void shutdownOutput() throws IOException { - //if (underlyingSocket != null) - // { - // underlyingSocket.shutdownOutput(); - // } - //else - // { - // super.shutdownOutput(); - // } - throw new UnsupportedOperationException("1.4 methods not enabled"); + if (underlyingSocket != null) + { + underlyingSocket.shutdownOutput(); + } + else + { + super.shutdownOutput(); + } } public boolean isConnected() @@ -1013,33 +1001,30 @@ { return super.isConnected(); } - //throw new UnsupportedOperationException("1.4 methods not enabled"); } public boolean isInputShutdown() { - //if (underlyingSocket != null) - // { - // return underlyingSocket.isInputShutdown(); - // } - //else - // { - // return super.isInputShutdown(); - // } - throw new UnsupportedOperationException("1.4 methods not enabled"); + if (underlyingSocket != null) + { + return underlyingSocket.isInputShutdown(); + } + else + { + return super.isInputShutdown(); + } } public boolean isOutputShutdown() { - //if (underlyingSocket != null) - // { - // return underlyingSocket.isOutputShutdown(); - // } - //else - // { - // return super.isOutputShutdown(); - // } - throw new UnsupportedOperationException("1.4 methods not enabled"); + if (underlyingSocket != null) + { + return underlyingSocket.isOutputShutdown(); + } + else + { + return super.isOutputShutdown(); + } } protected void finalize()
