From 765e6a0cd466943fc5b92481106e6b065e51709a Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@gcc.gnu.org>
Date: Thu, 19 Apr 2007 20:50:40 +0000
Subject: [PATCH] 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
---
 libjava/ChangeLog                             |   4 ++++
 libjava/classpath/ChangeLog                   |   6 ++++++
 .../ssl/provider/SSLSocketFactoryImpl.java    |   8 ++++++++
 .../ssl/provider/SSLSocketFactoryImpl.class   | Bin 3386 -> 3522 bytes
 .../gnu/java/awt/peer/gtk/ComponentGraphics.h |   4 ----
 .../net/ssl/provider/SSLSocketFactoryImpl.h   |   1 +
 6 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 500d47c999c..eb74cf830cd 100644
--- 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 987ac9eff84..777fa6d9107 100644
--- 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 6a3d7352eda..2915941db6e 100644
--- 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 9de6329b2407630a8ff42cee29be89b1c0cfa35a..1404374b39109dffaa264c8cd2146e54db60b805 100644
GIT binary patch
delta 263
zcmdlbbx4}))W2Q(7#J7~8HzV@rL*e^YiRmpC6*=X=cShD2j?eer<Pc=Go&*z@S}-x
zF{CkYPtIpAWz3oUl)Z?tU~&Y9BO~wTSsW9X;}{qjgc(v9m>5KXMza8UVho%>mIDJj
zkj=m#wwpmBQfmtXFC)`#hP24-3>hrj8KgD<WtbTFfg~GPRWE}8kj(?p!63*W#K0in
z2sAfyvH_1HZx*uYlbLySC%@-mWz3ztk;j=a4@e46=HTU1$wxPo5o{<E&|pS}La>EJ
E0H~WV8vp<R

delta 97
zcmX>ky-SMg)W2Q(7#J7~8S*!BrL#|7$X?8tF<F$Oh%sk!2Ztjg&*oDc6PVcq92tZe
yQYY`=ab!%J{EJ7PF@5rUUP*{>=44A=XU43_wY-XxC3&T|7#JCHfhICB<N*M#av6;P

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);
-- 
2.30.2