Imported GNU Classpath 0.90

Imported GNU Classpath 0.90
       * scripts/makemake.tcl: LocaleData.java moved to gnu/java/locale.

       * sources.am: Regenerated.
       * gcj/javaprims.h: Regenerated.
       * Makefile.in: Regenerated.
       * gcj/Makefile.in: Regenerated.
       * include/Makefile.in: Regenerated.
       * testsuite/Makefile.in: Regenerated.

       * gnu/java/lang/VMInstrumentationImpl.java: New override.
       * gnu/java/net/local/LocalSocketImpl.java: Likewise.
       * gnu/classpath/jdwp/VMMethod.java: Likewise.
       * gnu/classpath/jdwp/VMVirtualMachine.java: Update to latest
       interface.
       * java/lang/Thread.java: Add UncaughtExceptionHandler.
       * java/lang/reflect/Method.java: Implements GenericDeclaration and
       isSynthetic(),
       * java/lang/reflect/Field.java: Likewise.
       * java/lang/reflect/Constructor.java
       * java/lang/Class.java: Implements Type, GenericDeclaration,
       getSimpleName() and getEnclosing*() methods.
       * java/lang/Class.h: Add new public methods.
       * java/lang/Math.java: Add signum(), ulp() and log10().
       * java/lang/natMath.cc (log10): New function.
       * java/security/VMSecureRandom.java: New override.
       * java/util/logging/Logger.java: Updated to latest classpath
       version.
       * java/util/logging/LogManager.java: New override.

From-SVN: r113887
This commit is contained in:
Mark Wielaard 2006-05-18 17:29:21 +00:00
parent eaec4980e1
commit 4f9533c772
1640 changed files with 126485 additions and 104808 deletions

View file

@ -1,5 +1,5 @@
/* UnicastRef.java --
Copyright (c) 1996, 1997, 1998, 1999, 2002, 2005
Copyright (c) 1996, 1997, 1998, 1999, 2002, 2005, 2006
Free Software Foundation, Inc.
This file is part of GNU Classpath.
@ -36,8 +36,11 @@ this exception to your version of the library, but you are not
obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */
package gnu.java.rmi.server;
import gnu.java.rmi.dgc.LeaseRenewingTask;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
@ -50,6 +53,7 @@ import java.lang.reflect.Method;
import java.rmi.ConnectException;
import java.rmi.Remote;
import java.rmi.RemoteException;
import java.rmi.dgc.Lease;
import java.rmi.server.ObjID;
import java.rmi.server.Operation;
import java.rmi.server.RMIClientSocketFactory;
@ -59,221 +63,462 @@ import java.rmi.server.RemoteRef;
import java.rmi.server.UID;
public class UnicastRef
implements RemoteRef, ProtocolConstants {
implements RemoteRef, ProtocolConstants
{
public ObjID objid;
UnicastConnectionManager manager;
/**
* Use serial version UID for iteroperability
*/
private static final long serialVersionUID = 1;
/**
* Used by serialization, and let subclass capable of having default constructor
*/
// must be public otherwise java.rmi.RemoteObject cannot instantiate this class
// -- iP
public UnicastRef() {
}
public ObjID objid;
public UnicastRef(ObjID objid, String host, int port, RMIClientSocketFactory csf) {
this(objid);
manager = UnicastConnectionManager.getInstance(host, port, csf);
}
UnicastConnectionManager manager;
public UnicastRef(ObjID objid) {
this.objid = objid;
}
/**
* Used by serialization, and let subclass capable of having default
* constructor
*/
// must be public otherwise java.rmi.RemoteObject cannot instantiate this
// class
// -- iP
public UnicastRef()
{
}
public Object invoke(Remote obj, Method method, Object[] params, long opnum) throws Exception {
// Check if client and server are in the same VM, then local call can be used to
public UnicastRef(ObjID objid, String host, int port,
RMIClientSocketFactory csf)
{
this(objid);
manager = UnicastConnectionManager.getInstance(host, port, csf);
}
public UnicastRef(ObjID objid)
{
this.objid = objid;
}
public Object invoke(Remote obj, Method method, Object[] params, long opnum)
throws Exception
{
// Check if client and server are in the same VM, then local call can be
// used to
// replace remote call, but it's somewhat violating remote semantic.
Object svrobj = manager.serverobj;
// Make sure that the server object is compatible. It could be loaded from a different
// Make sure that the server object is compatible. It could be loaded from a
// different
// classloader --iP
if(svrobj != null && method.getDeclaringClass().isInstance(svrobj)){
//local call
Object ret = null;
try{
ret = method.invoke(svrobj, params);
}catch(InvocationTargetException e){
throw (Exception)e.getTargetException();
}
//System.out.println("\n\n ***** local call: " + method + "\nreturn: " + ret + "\n\n");
return ret;
}
//System.out.println("***************** remote call:" + manager.serverPort);
return (invokeCommon(obj, method, params, -1, opnum));
}
if (svrobj != null && method.getDeclaringClass().isInstance(svrobj))
{
// local call
Object ret = null;
try
{
ret = method.invoke(svrobj, params);
}
catch (InvocationTargetException e)
{
throw (Exception) e.getTargetException();
}
// System.out.println("\n\n ***** local call: " + method + "\nreturn: "
// + ret + "\n\n");
return ret;
}
// System.out.println("***************** remote call:" +
// manager.serverPort);
return (invokeCommon(obj, method, params, - 1, opnum));
}
private Object invokeCommon(Remote obj, Method method, Object[] params, int opnum, long hash) throws Exception {
UnicastConnection conn;
try {
conn = manager.getConnection();
}
catch (IOException e1) {
throw new RemoteException("connection failed to host: " + manager.serverName, e1);
}
/**
* The ordinary number of the DGC messages.
*/
static long dgcSequence;
ObjectOutputStream out;
DataOutputStream dout;
try {
dout = conn.getDataOutputStream();
dout.writeByte(MESSAGE_CALL);
/**
* The DGC object id, also serves as a synchronization target to increment the
* dgcSequence safely.
*/
static final ObjID dgcId = new ObjID(ObjID.DGC_ID);
out = conn.startObjectOutputStream(); // (re)start ObjectOutputStream
objid.write(out);
out.writeInt(opnum);
out.writeLong(hash);
// must handle primitive class and their wrapper classes
Class clss[] = method.getParameterTypes();
for(int i = 0; i < clss.length; i++)
((RMIObjectOutputStream)out).writeValue(params[i], clss[i]);
ObjID[] this_id;
out.flush();
}
catch (IOException e2) {
throw new RemoteException("call failed: ", e2);
}
/**
* The number of the method "dirty" in the DGC.
*/
static int DIRTY = 1;
int returncode;
Object returnval;
DataInputStream din;
ObjectInputStream in;
UID ack;
try {
din = conn.getDataInputStream();
if ((returncode = din.readUnsignedByte()) != MESSAGE_CALL_ACK) {
conn.disconnect();
throw new RemoteException("Call not acked:" + returncode);
}
/**
* The DGC interface hash code.
*/
static final long dgcInterfaceHash = - 669196253586618813L;
in = conn.startObjectInputStream(); // (re)start ObjectInputStream
returncode = in.readUnsignedByte();
ack = UID.read(in);
/**
* Notify the DGC of the remote side that we still hold this object.
*/
public Lease notifyDGC(Lease lease) throws Exception
{
long seq;
synchronized (dgcId)
{
seq = dgcSequence++;
}
Class cls = method.getReturnType();
if (this_id == null)
this_id = new ObjID[] { objid };
if (returncode == RETURN_NACK) {
returnval = in.readObject(); // get Exception
} else if(cls == Void.TYPE) {
returnval = null;
// in.readObject() // not required! returntype 'void' means no field is returned.
} else {
returnval = ((RMIObjectInputStream)in).readValue(cls); // get returnvalue
}
} catch (IOException e3) {
//for debug: e3.printStackTrace();
throw new RemoteException("call return failed: ", e3);
}
/* if DGCAck is necessary??
//According to RMI wire protocol, send a DGCAck
// to indicate receiving return value
dout.writeByte(MESSAGE_DGCACK);
ack.write(dout);
out.flush();
*/
manager.discardConnection(conn);
if (returncode != RETURN_ACK && returnval != null) {
if (returncode == RETURN_NACK) throw (Exception)returnval;
else throw new RemoteException("unexpected returncode: " + returncode);
}
return (returnval);
}
/**
* @deprecated
*/
public RemoteCall newCall(RemoteObject obj, Operation[] op, int opnum, long hash) throws RemoteException {
UnicastConnection conn;
try {
conn = manager.getConnection();
}
catch (IOException e1) {
throw new ConnectException("connection failed to host: " + manager.serverName, e1);
}
try
{
conn = manager.getConnection();
}
catch (IOException e1)
{
throw new RemoteException("connection failed to host: "
+ manager.serverName, e1);
}
//obj: useless?
ObjectOutputStream out;
DataOutputStream dout;
try
{
dout = conn.getDataOutputStream();
dout.writeByte(MESSAGE_CALL);
return (new UnicastRemoteCall(conn, objid, opnum, hash));
}
out = conn.startObjectOutputStream(); // (re)start ObjectOutputStream
/**
* @deprecated
*/
public void invoke(RemoteCall call) throws Exception {
UnicastRemoteCall c = (UnicastRemoteCall)call;
call.executeCall();
}
dgcId.write(out);
// The number of the operation is 1 ("dirty")
out.writeInt(DIRTY);
out.writeLong(dgcInterfaceHash);
/**
* @deprecated
*/
public void done(RemoteCall call) throws RemoteException {
UnicastRemoteCall c = (UnicastRemoteCall)call;
try{
c.done();
} catch(IOException e){}
RMIObjectOutputStream rout = (RMIObjectOutputStream) out;
rout.writeValue(this_id, this_id.getClass());
rout.writeLong(seq);
rout.writeValue(lease, lease.getClass());
out.flush();
}
catch (IOException e2)
{
throw new RemoteException("DGC call failed: ", e2);
}
int returncode;
Object returnval;
DataInputStream din;
ObjectInputStream in;
UID ack;
try
{
din = conn.getDataInputStream();
if ((returncode = din.readUnsignedByte()) != MESSAGE_CALL_ACK)
{
conn.disconnect();
throw new RemoteException("DGC Call not acked:" + returncode);
}
in = conn.startObjectInputStream(); // (re)start ObjectInputStream
returncode = in.readUnsignedByte();
ack = UID.read(in);
if (returncode == RETURN_NACK)
{
returnval = in.readObject(); // get Exception
}
else
{
returnval = ((RMIObjectInputStream) in).readValue(Lease.class);
}
}
catch (IOException e3)
{
throw new RemoteException("DGC call return failed: ", e3);
}
manager.discardConnection(conn);
if (returncode != RETURN_ACK && returnval != null)
{
if (returncode == RETURN_NACK)
throw (Exception) returnval;
else
throw new RemoteException("DGC unexpected returncode: " + returncode);
}
return (Lease) returnval;
}
/**
* Invoke the remote method on the given object. This part is overridden by
* the activatable objects.
*/
protected Object invokeCommon(Remote obj, Method method, Object[] params,
int opnum, long hash) throws Exception
{
UnicastConnection conn;
try
{
conn = manager.getConnection();
return invokeCommon(conn, obj, method, params, opnum, hash);
}
catch (IOException e1)
{
throw new RemoteException("connection failed to host: "
+ manager.serverName, e1);
}
}
/**
* Invoke the remote method on the given object when connection is already
* established.
*/
protected Object invokeCommon(UnicastConnection conn, Remote obj,
Method method, Object[] params, int opnum,
long hash) throws Exception
{
ObjectOutputStream out;
DataOutputStream dout;
try
{
dout = conn.getDataOutputStream();
dout.writeByte(MESSAGE_CALL);
out = conn.startObjectOutputStream(); // (re)start ObjectOutputStream
objid.write(out);
out.writeInt(opnum);
out.writeLong(hash);
// must handle primitive class and their wrapper classes
Class clss[] = method.getParameterTypes();
for (int i = 0; i < clss.length; i++)
((RMIObjectOutputStream) out).writeValue(params[i], clss[i]);
out.flush();
}
catch (IOException e2)
{
throw new RemoteException("call failed: ", e2);
}
int returncode;
Object returnval;
DataInputStream din;
ObjectInputStream in;
UID ack;
try
{
din = conn.getDataInputStream();
if ((returncode = din.readUnsignedByte()) != MESSAGE_CALL_ACK)
{
conn.disconnect();
throw new RemoteException("Call not acked:" + returncode);
}
in = conn.startObjectInputStream(); // (re)start ObjectInputStream
returncode = in.readUnsignedByte();
ack = UID.read(in);
Class cls = method.getReturnType();
if (returncode == RETURN_NACK)
{
returnval = in.readObject(); // get Exception
}
else if (cls == Void.TYPE)
{
returnval = null;
// in.readObject() // not required! returntype 'void' means no field
// is returned.
}
else
{
returnval = ((RMIObjectInputStream) in).readValue(cls); // get
// returnvalue
}
}
catch (IOException e3)
{
// for debug: e3.printStackTrace();
throw new RemoteException("call return failed: ", e3);
}
/*
* if DGCAck is necessary?? //According to RMI wire protocol, send a DGCAck //
* to indicate receiving return value dout.writeByte(MESSAGE_DGCACK);
* ack.write(dout); out.flush();
*/
manager.discardConnection(conn);
if (returncode != RETURN_ACK && returnval != null)
{
if (returncode == RETURN_NACK)
throw (Exception) returnval;
else
throw new RemoteException("unexpected returncode: " + returncode);
}
return (returnval);
}
/**
* @deprecated
*/
public RemoteCall newCall(RemoteObject obj, Operation[] op, int opnum,
long hash) throws RemoteException
{
UnicastConnection conn;
try
{
conn = manager.getConnection();
}
catch (IOException e1)
{
throw new ConnectException("connection failed to host: "
+ manager.serverName, e1);
}
// obj: useless?
return (new UnicastRemoteCall(conn, objid, opnum, hash));
}
/**
* @deprecated
*/
public void invoke(RemoteCall call) throws Exception
{
UnicastRemoteCall c = (UnicastRemoteCall) call;
call.executeCall();
}
/**
* @deprecated
*/
public void done(RemoteCall call) throws RemoteException
{
UnicastRemoteCall c = (UnicastRemoteCall) call;
try
{
c.done();
}
catch (IOException e)
{
}
UnicastConnection conn = c.getConnection();
manager.discardConnection(conn);
}
manager.discardConnection(conn);
}
public void writeExternal(ObjectOutput out) throws IOException {
if (manager == null) {
throw new IOException("no connection");
}
manager.write(out);
objid.write(out);
// This byte is somewhat confusing when interoperating with JDK
out.writeByte(0); //RETURN_ACK);
}
public void writeExternal(ObjectOutput out) throws IOException
{
if (manager == null)
{
throw new IOException("no connection");
}
manager.write(out);
objid.write(out);
// This byte is somewhat confusing when interoperating with JDK
out.writeByte(0); // RETURN_ACK);
}
public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
manager = UnicastConnectionManager.read(in);
objid = ObjID.read(in);
byte ack = in.readByte();
// This byte is somewhat confusing when interoperating with JDK
if (ack != RETURN_ACK && ack != 0/*jdk ack value*/) {
throw new IOException("no ack found");
}
}
public void readExternal(ObjectInput in) throws IOException,
ClassNotFoundException
{
manager = UnicastConnectionManager.read(in);
objid = ObjID.read(in);
byte ack = in.readByte();
// This byte is somewhat confusing when interoperating with JDK
if (ack != RETURN_ACK && ack != 0/* jdk ack value */)
{
throw new IOException("no ack found");
}
public boolean remoteEquals(RemoteRef ref) {
throw new Error("Not implemented");
}
// Notify the DGC of the remote side that we hold the reference to the
// received object. Do not notify if the client and server are on the
// same virtual machine.
if (manager.serverobj == null)
LeaseRenewingTask.scheduleLeases(this);
}
public int remoteHashCode() {
throw new Error("Not implemented");
}
public boolean remoteEquals(RemoteRef ref)
{
throw new Error("Not implemented");
}
public String getRefClass(ObjectOutput out) {
return ("UnicastRef");
}
public int remoteHashCode()
{
throw new Error("Not implemented");
}
public String remoteToString() {
throw new Error("Not implemented");
}
public String getRefClass(ObjectOutput out)
{
return ("UnicastRef");
}
/**
* Return the string representing the remote reference information.
*/
public String remoteToString()
{
if (manager!=null)
return manager.toString();
else
return "null manager";
}
public void dump(UnicastConnection conn) {
try {
DataInputStream din = conn.getDataInputStream();
for (;;) {
int b = din.readUnsignedByte();
System.out.print(Integer.toHexString(b));
if (b >= 32 && b < 128) {
System.out.print(": " + (char)b);
}
System.out.println();
}
}
catch (IOException _) {
}
}
public void dump(UnicastConnection conn)
{
try
{
DataInputStream din = conn.getDataInputStream();
for (;;)
{
int b = din.readUnsignedByte();
System.out.print(Integer.toHexString(b));
if (b >= 32 && b < 128)
{
System.out.print(": " + (char) b);
}
System.out.println();
}
}
catch (IOException _)
{
}
}
/**
* Check if this UnicastRef points to the object as the passed UnicastRef.
* Both the object Id and manager must be the same.
*
* @return true if the passed reference points to the same remote object as
* this reference, false otherwise.
*/
public boolean equals(Object other)
{
if (other instanceof UnicastRef)
{
UnicastRef r = (UnicastRef) other;
return r.manager.equals(manager) && r.objid.equals(objid);
}
else
return false;
}
/**
* Get the hash code of this UnicastRef, combining hash code of the manager
* with hash code of the object id.
*/
public int hashCode()
{
return manager.hashCode() ^ objid.hashCode();
}
}