[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: fix for Socket.getPort on unconnected sockets

[Kaffe CVS]

PatchSet 5416 
Date: 2004/11/07 19:22:14
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: fix for Socket.getPort on unconnected sockets

2004-11-07  Dalibor Topic  <robilad at kaffe.org>

        * libraries/javalib/java/net/Socket.java:
        Resynced with GNU Classpath.

        2004-11-05  Noa Resare  <noa at resare.com>

        * java/net/Socket.java(getPort): Return 0 instead of -1 on
        unconnected sockets.

Members: 
	ChangeLog:1.2965->1.2966 
	libraries/javalib/java/net/Socket.java:1.38->1.39 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2965 kaffe/ChangeLog:1.2966
--- kaffe/ChangeLog:1.2965	Sun Nov  7 18:06:32 2004
+++ kaffe/ChangeLog	Sun Nov  7 19:22:14 2004
@@ -1,5 +1,15 @@
 2004-11-07  Dalibor Topic  <robilad at kaffe.org>
 
+	* libraries/javalib/java/net/Socket.java:
+        Resynced with GNU Classpath.
+
+	2004-11-05  Noa Resare  <noa at resare.com>
+
+        * java/net/Socket.java(getPort): Return 0 instead of -1 on
+        unconnected sockets.
+
+2004-11-07  Dalibor Topic  <robilad at kaffe.org>
+
 	* libraries/javalib/gnu/java/awt/peer/gtk/GtkComponentPeer.java:
         Resynced with GNU Classpath.
 
Index: kaffe/libraries/javalib/java/net/Socket.java
diff -u kaffe/libraries/javalib/java/net/Socket.java:1.38 kaffe/libraries/javalib/java/net/Socket.java:1.39
--- kaffe/libraries/javalib/java/net/Socket.java:1.38	Sat Oct 16 13:31:00 2004
+++ kaffe/libraries/javalib/java/net/Socket.java	Sun Nov  7 19:22:17 2004
@@ -525,14 +525,14 @@
 
   /**
    * Returns the port number of the remote end of the socket connection.  If
-   * this socket is not connected, then -1 is returned.
+   * this socket is not connected, then 0 is returned.
    *
    * @return The remote port this socket is connected to
    */
   public int getPort()
   {
     if (! isConnected())
-      return -1;
+      return 0;
 
     try
       {