diff options
| author | Tom Tromey <tromey@gcc.gnu.org> | 2007-04-19 20:50:40 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2007-04-19 20:50:40 +0000 |
| commit | 765e6a0cd466943fc5b92481106e6b065e51709a (patch) | |
| tree | e969c1599f31fd1cdc0ea264f3181631da8c1fb9 /libjava/gnu | |
| parent | 06785a48be7e36820bbce12d2f4f2bcb23ef6965 (diff) | |
| download | gcc-765e6a0cd466943fc5b92481106e6b065e51709a.tar.gz | |
re PR crypto/31626 (javax.net.SocketFactory#createSocket() throws UnsupportedOperationException)
libjava
* gnu/javax/net/ssl/provider/SSLSocketFactoryImpl.h: Rebuilt.
libjava/classpath
2007-04-19 Casey Marshall <csm@gnu.org>
PR classpath/31626:
* gnu/javax/net/ssl/provider/SSLSocketFactoryImpl.java
(createSocket): New method.
From-SVN: r123977
Diffstat (limited to 'libjava/gnu')
| -rw-r--r-- | libjava/gnu/java/awt/peer/gtk/ComponentGraphics.h | 4 | ||||
| -rw-r--r-- | libjava/gnu/javax/net/ssl/provider/SSLSocketFactoryImpl.h | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/libjava/gnu/java/awt/peer/gtk/ComponentGraphics.h b/libjava/gnu/java/awt/peer/gtk/ComponentGraphics.h index fbc87a85658..1f11a4b7f7b 100644 --- a/libjava/gnu/java/awt/peer/gtk/ComponentGraphics.h +++ b/libjava/gnu/java/awt/peer/gtk/ComponentGraphics.h @@ -72,10 +72,6 @@ private: jlong initState(::gnu::java::awt::peer::gtk::GtkComponentPeer *); void lock(); void unlock(); -public: - virtual void dispose(); -private: - void disposeSurface(jlong); public: // actually protected virtual jlong initFromVolatile(jlong, jint, jint); private: diff --git a/libjava/gnu/javax/net/ssl/provider/SSLSocketFactoryImpl.h b/libjava/gnu/javax/net/ssl/provider/SSLSocketFactoryImpl.h index 24ac5f9bce1..c0263bea1b7 100644 --- a/libjava/gnu/javax/net/ssl/provider/SSLSocketFactoryImpl.h +++ b/libjava/gnu/javax/net/ssl/provider/SSLSocketFactoryImpl.h @@ -51,6 +51,7 @@ public: virtual ::gnu::javax::net::ssl::provider::SSLSocketImpl * SSLSocketFactoryImpl$createSocket(::java::lang::String *, jint, ::java::net::InetAddress *, jint); virtual ::gnu::javax::net::ssl::provider::SSLSocketImpl * SSLSocketFactoryImpl$createSocket(::java::net::InetAddress *, jint); virtual ::gnu::javax::net::ssl::provider::SSLSocketImpl * SSLSocketFactoryImpl$createSocket(::java::net::InetAddress *, jint, ::java::net::InetAddress *, jint); + virtual ::java::net::Socket * createSocket(); virtual ::java::net::Socket * createSocket(::java::net::InetAddress *, jint, ::java::net::InetAddress *, jint); virtual ::java::net::Socket * createSocket(::java::net::InetAddress *, jint); virtual ::java::net::Socket * createSocket(::java::lang::String *, jint, ::java::net::InetAddress *, jint); |