* 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.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@117035 138bc75d-0d04-0410-961f-82ee72b054a4

2 files changed, 117 insertions, 122 deletions

diff --git a/libjava/classpath/ChangeLog.gcj b/libjava/classpath/ChangeLog.gcj
index 923e6070d82..fa1bbf37bf5 100644
--- a/libjava/classpath/ChangeLog.gcj
+++ b/libjava/classpath/ChangeLog.gcj
@@ -1,3 +1,13 @@
+2006-09-18  Tom Tromey  <tromey@redhat.com>
+
+	* 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.
+
 2006-09-11 David Daney  <ddaney@avtrex.com>
 
 	PR classpath/28580
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/SSLSocket.java b/libjava/classpath/gnu/javax/net/ssl/provider/SSLSocket.java
index a564659c02c..d08bc50f1c9 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/SSLSocket.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/SSLSocket.java
@@ -845,7 +845,6 @@ final class SSLSocket extends javax.net.ssl.SSLSocket
       {
         return super.isBound();
       }
-    //throw new UnsupportedOperationException("1.4 methods not enabled");
   }
 
   public boolean isClosed()
@@ -858,149 +857,138 @@ final class SSLSocket extends javax.net.ssl.SSLSocket
       {
         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 @@ final class SSLSocket extends javax.net.ssl.SSLSocket
       {
         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()