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

Kaffe CVS cvs-commits at kaffe.org
Fri Nov 26 14:44:31 PST 2004


PatchSet 5492 
Date: 2004/11/26 22:39:40
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: fix for Socket.getPort

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

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

        2004-11-17  Michael Koch  <konqueror at gmx.de>

        * java/net/Socket.java (getPort): Return 0 in error case.

Members: 
	ChangeLog:1.3038->1.3039 
	libraries/javalib/java/net/Socket.java:1.39->1.40 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3038 kaffe/ChangeLog:1.3039
--- kaffe/ChangeLog:1.3038	Fri Nov 26 21:36:16 2004
+++ kaffe/ChangeLog	Fri Nov 26 22:39:40 2004
@@ -1,5 +1,14 @@
 2004-11-26  Dalibor Topic  <robilad at kaffe.org>
 
+	* libraries/javalib/java/net/Socket.java:
+        Resynced with GNU Classpath.
+
+	2004-11-17  Michael Koch  <konqueror at gmx.de>
+
+        * java/net/Socket.java (getPort): Return 0 in error case.
+
+2004-11-26  Dalibor Topic  <robilad at kaffe.org>
+
 	* libraries/javalib/java/nio/DirectByteBufferImpl.java:
         Resynced with GNU Classpath.
 
Index: kaffe/libraries/javalib/java/net/Socket.java
diff -u kaffe/libraries/javalib/java/net/Socket.java:1.39 kaffe/libraries/javalib/java/net/Socket.java:1.40
--- kaffe/libraries/javalib/java/net/Socket.java:1.39	Sun Nov  7 19:22:17 2004
+++ kaffe/libraries/javalib/java/net/Socket.java	Fri Nov 26 22:39:44 2004
@@ -543,7 +543,7 @@
 	// This cannot happen as we are connected.
       }
 
-    return -1;
+    return 0;
   }
 
   /**




More information about the kaffe mailing list