re PR crypto/31626 (javax.net.SocketFactory#createSocket() throws UnsupportedOperatio...

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

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 500d47c..eb74cf8 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,7 @@
+2007-04-19  Tom Tromey  <tromey@redhat.com>
+
+       * gnu/javax/net/ssl/provider/SSLSocketFactoryImpl.h: Rebuilt.
+
 2007-04-18  Tom Tromey  <tromey@redhat.com>
 
        * Regenerated headers with new gjavah.

diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog
index 987ac9e..777fa6d 100644 (file)
--- a/libjava/classpath/ChangeLog
+++ b/libjava/classpath/ChangeLog
@@ -1,3 +1,9 @@
+2007-04-19  Casey Marshall  <csm@gnu.org>
+
+       PR classpath/31626:
+       * gnu/javax/net/ssl/provider/SSLSocketFactoryImpl.java
+       (createSocket): New method.
+
 2007-04-18  Tom Tromey  <tromey@redhat.com>
 
        * tools/gnu/classpath/tools/javah/MethodHelper.java (print):

diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/SSLSocketFactoryImpl.java b/libjava/classpath/gnu/javax/net/ssl/provider/SSLSocketFactoryImpl.java
index 6a3d735..2915941 100644 (file)
--- a/libjava/classpath/gnu/javax/net/ssl/provider/SSLSocketFactoryImpl.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/SSLSocketFactoryImpl.java
@@ -132,4 +132,12 @@ public class SSLSocketFactoryImpl extends SSLSocketFactory
     socket.connect(new InetSocketAddress(host, port));
     return socket;
   }
+
+  /* (non-Javadoc)
+   * @see javax.net.SocketFactory#createSocket()
+   */
+  @Override public Socket createSocket() throws IOException
+  {
+    return new SSLSocketImpl(contextImpl, null, -1, new Socket(), true);
+  }
 }

diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/SSLSocketFactoryImpl.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/SSLSocketFactoryImpl.class
index 9de6329..1404374 100644 (file)
Binary files a/libjava/classpath/lib/gnu/javax/net/ssl/provider/SSLSocketFactoryImpl.class and b/libjava/classpath/lib/gnu/javax/net/ssl/provider/SSLSocketFactoryImpl.class differ

diff --git a/libjava/gnu/java/awt/peer/gtk/ComponentGraphics.h b/libjava/gnu/java/awt/peer/gtk/ComponentGraphics.h
index fbc87a8..1f11a4b 100644 (file)
--- 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 24ac5f9..c0263be 100644 (file)
--- 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);