PlainSocketImpl.java: Corrected copyright & header comments.

* java/net/PlainSocketImpl.java: Corrected copyright & header comments.
	* java/net/SocketImpl.java: Added marker for JDK 1.2 work.
	* java/net/natPlainSocketImpl.cc (bind): Throw BindException.
	(connect): Throw ConnectException.

From-SVN: r26896
This commit is contained in:
Warren Levy 1999-05-12 01:51:23 +00:00 committed by Warren Levy
parent 3f281ce6f5
commit 7d9a55eb5b
4 changed files with 26 additions and 4 deletions

View File

@ -1,3 +1,10 @@
1999-05-12 Warren Levy <warrenl@cygnus.com>
* java/net/PlainSocketImpl.java: Corrected copyright & header comments.
* java/net/SocketImpl.java: Added marker for JDK 1.2 work.
* java/net/natPlainSocketImpl.cc (bind): Throw BindException.
(connect): Throw ConnectException.
1999-05-11 Tom Tromey <tromey@cygnus.com> 1999-05-11 Tom Tromey <tromey@cygnus.com>
* Makefile.in: Rebuilt. * Makefile.in: Rebuilt.

View File

@ -1,6 +1,6 @@
// natClass.cc - Implementation of java.lang.Class native methods. // PlainSocketImpl.java - Implementation of SocketImpl.
/* Copyright (C) 1998, 1999 Cygnus Solutions /* Copyright (C) 1999 Cygnus Solutions
This file is part of libgcj. This file is part of libgcj.
@ -11,6 +11,17 @@ details. */
package java.net; package java.net;
import java.io.*; import java.io.*;
/**
* @author Per Bothner <bothner@cygnus.com>
* @date February 22, 1999.
*/
/**
* Written using on-line Java Platform 1.2 API Specification, as well
* as "The Java Class Libraries", 2nd edition (Addison-Wesley, 1998).
* Status: Believed complete and correct.
*/
class PlainSocketImpl extends SocketImpl class PlainSocketImpl extends SocketImpl
{ {
int fnum = -1; int fnum = -1;

View File

@ -20,6 +20,8 @@ import java.io.*;
* Believed complete and correct, except for implementation of toString. * Believed complete and correct, except for implementation of toString.
*/ */
// JDK1.2: needs to implement SocketOptions.
// JDK1.2: public abstract class SocketImpl implements SocketOptions
public abstract class SocketImpl public abstract class SocketImpl
{ {
protected InetAddress address; protected InetAddress address;

View File

@ -18,6 +18,8 @@ details. */
#include <cni.h> #include <cni.h>
#include <java/io/IOException.h> #include <java/io/IOException.h>
#include <java/io/FileDescriptor.h> #include <java/io/FileDescriptor.h>
#include <java/net/BindException.h>
#include <java/net/ConnectException.h>
#include <java/net/PlainSocketImpl.h> #include <java/net/PlainSocketImpl.h>
#include <java/net/InetAddress.h> #include <java/net/InetAddress.h>
@ -84,7 +86,7 @@ java::net::PlainSocketImpl::bind (java::net::InetAddress *host, jint lport)
char msg[100]; char msg[100];
char* strerr = strerror (errno); char* strerr = strerror (errno);
sprintf (msg, "SocketImpl.bind: %.*s", 80, strerr); sprintf (msg, "SocketImpl.bind: %.*s", 80, strerr);
JvThrow (new java::io::IOException (JvNewStringUTF (msg))); JvThrow (new java::net::BindException (JvNewStringUTF (msg)));
} }
void void
@ -123,7 +125,7 @@ java::net::PlainSocketImpl::connect (java::net::InetAddress *host, jint rport)
char msg[100]; char msg[100];
char* strerr = strerror (errno); char* strerr = strerror (errno);
sprintf (msg, "SocketImpl.connect: %.*s", 80, strerr); sprintf (msg, "SocketImpl.connect: %.*s", 80, strerr);
JvThrow (new java::io::IOException (JvNewStringUTF (msg))); JvThrow (new java::net::ConnectException (JvNewStringUTF (msg)));
} }
void void