2002-02-14 Mark Wielaard <mark@klomp.org>

    * java/math/BigInteger.java: import gnu.java.math.MPN not the whole
    package as a workaround for gcj 3.0.x

2002-02-14  Mark Wielaard <mark@klomp.org>

    * java/security/BasicPermission.java: extends with fully qualified
    classname as workaround for gcj 3.0.4.

2002-02-14  Eric Blake  <ebb9@email.byu.edu>

    * java/net/DatagramSocketImpl.java (setOption, getOption): Work
    around gcj bug of wrong emitted qualifier for inherited method.
    * java/net/SocketImpl.java (setOption, getOption): Ditto.
    * java/util/WeakHashMap.java (WeakEntrySet): Add non-private
    constructor to reduce amount of emitted bytecode. While this
    happens to work around a jikes 1.15 bug, it is still a useful
    patch even for correct compilers.
    * java/rmi/server/RMIClassLoader.java (MyClassLoader): Ditto.
    * gnu/java/rmi/server/UnicastRemoteCall.java
    (DummyObjectOutputStream, DummyObjectInputStream): Ditto.

2002-02-14  Eric Blake  <ebb9@email.byu.edu>

    * java/net/DatagramSocketImpl.java: Reformat (no code changes).
    * java/net/SocketImpl.java: Ditto.
    * java/rmi/server/RMIClassLoader.java: Ditto.
    * gnu/java/rmi/server/UnicastRemoteCall.java: Ditto.

2002-02-14  Mark Wielaard <mark@klomp.org>

    Thanks to Takashi Okamoto
    * java/util/Arrays.java (ArrayList.indexOf()): this.equals().
    * java/util/Arrays.java (ArrayList.lastIndexOf()): Likewise.
    * java/util/WeakHashMap.java (WeakEntry.getEntry()): this.get().


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

1 files changed, 329 insertions, 265 deletions

diff --git a/libjava/gnu/java/rmi/server/UnicastRemoteCall.java b/libjava/gnu/java/rmi/server/UnicastRemoteCall.java
index 3ea07340e3f..200538d4ae8 100644
--- a/libjava/gnu/java/rmi/server/UnicastRemoteCall.java
+++ b/libjava/gnu/java/rmi/server/UnicastRemoteCall.java
@@ -1,5 +1,5 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* UnicastRemoteCall.java
+  Copyright (c) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -45,267 +45,331 @@ import java.io.StreamCorruptedException;
 import java.rmi.server.RemoteCall;
 import java.util.Vector;
 
-public class UnicastRemoteCall
-	implements RemoteCall {
-
-private UnicastConnection conn;
-private Object result;
-private Object object;
-private int opnum;
-private long hash;
-private Vector vec;
-private int ptr;
-
-/**
- * Incoming call.
- */
-UnicastRemoteCall(UnicastConnection conn) {
-	this.conn = conn;
-}
-
-/**
- * Outgoing call.
- */
-UnicastRemoteCall(Object obj, int opnum, long hash) {
-	this.object = obj;
-	this.opnum = opnum;
-	this.hash = hash;
-}
-
-public ObjectOutput getOutputStream() throws IOException {
-	vec = new Vector();
-	return (new DummyObjectOutputStream());
-}
-
-public void releaseOutputStream() throws IOException {
-	// Does nothing.
-}
-
-public ObjectInput getInputStream() throws IOException {
-	if (conn != null) {
-		return (conn.getObjectInputStream());
-	}
-	else {
-		ptr = 0;
-		return (new DummyObjectInputStream());
-	}
-}
-
-public void releaseInputStream() throws IOException {
-	// Does nothing.
-}
-
-public ObjectOutput getResultStream(boolean success) throws IOException, StreamCorruptedException {
-	vec = new Vector();
-	return (new DummyObjectOutputStream());
-}
-
-public void executeCall() throws Exception {
-	throw new Error("Not implemented");
-}
-
-public void done() throws IOException {
-	/* Does nothing */
-}
-
-Object returnValue() {
-	return (vec.elementAt(0));
-}
-
-Object[] getArguments() {
-	return (vec.toArray());
-}
-
-Object getObject() {
-	return (object);
-}
-
-int getOpnum() {
-	return (opnum);
-}
-
-long getHash() {
-	return (hash);
-}
-
-void setReturnValue(Object obj) {
-	vec.removeAllElements();
-	vec.addElement(obj);
-}
-
-/**
- * Dummy object output class.
- */
-private class DummyObjectOutputStream implements ObjectOutput {
-
-public void writeBoolean(boolean v) throws IOException {
-	vec.addElement(new Boolean(v));
-}
-
-public void writeByte(int v) throws IOException {
-	vec.addElement(new Byte((byte)v));
-}
-
-public void writeChar(int v) throws IOException {
-	vec.addElement(new Character((char)v));
-}
-
-public void writeDouble(double v) throws IOException {
-	vec.addElement(new Double(v));
-}
-
-public void writeFloat(float v) throws IOException {
-	vec.addElement(new Float(v));
-}
-
-public void writeInt(int v) throws IOException {
-	vec.addElement(new Integer(v));
-}
-
-public void writeLong(long v) throws IOException {
-	vec.addElement(new Long(v));
-}
-
-public void writeShort(int v) throws IOException {
-	vec.addElement(new Short((short)v));
-}
-
-public void writeObject(Object obj) throws IOException {
-	vec.addElement(obj);
-}
-
-public void write(byte b[]) throws IOException {
-	throw new IOException("not required");
-}
-
-public void write(byte b[], int off, int len) throws IOException {
-	throw new IOException("not required");
-}
-
-public void write(int b) throws IOException {
-	throw new IOException("not required");
-}
-
-public void writeBytes(String s) throws IOException {
-	throw new IOException("not required");
-}
-
-public void writeChars(String s) throws IOException {
-	throw new IOException("not required");
-}
-
-public void writeUTF(String str) throws IOException {
-	throw new IOException("not required");
-}
-
-public void flush() throws IOException {
-}
-
-public void close() throws IOException {
-}
-
-}
-
-/**
- * Dummy object input class.
- */
-private class DummyObjectInputStream implements ObjectInput {
-
-public boolean readBoolean() throws IOException {
-	Object obj = vec.elementAt(ptr++);
-	return (((Boolean)obj).booleanValue());
-}
-
-public byte readByte() throws IOException {
-	Object obj = vec.elementAt(ptr++);
-	return (((Byte)obj).byteValue());
-}
-
-public char readChar() throws IOException {
-	Object obj = vec.elementAt(ptr++);
-	return (((Character)obj).charValue());
-}
-
-public double readDouble() throws IOException {
-	Object obj = vec.elementAt(ptr++);
-	return (((Double)obj).doubleValue());
-}
-
-public float readFloat() throws IOException {
-	Object obj = vec.elementAt(ptr++);
-	return (((Float)obj).floatValue());
-}
-
-public int readInt() throws IOException {
-	Object obj = vec.elementAt(ptr++);
-	return (((Integer)obj).intValue());
-}
-
-public long readLong() throws IOException {
-	Object obj = vec.elementAt(ptr++);
-	return (((Long)obj).longValue());
-}
-
-public short readShort() throws IOException {
-	Object obj = vec.elementAt(ptr++);
-	return (((Short)obj).shortValue());
-}
-
-public Object readObject() throws IOException {
-	return (vec.elementAt(ptr++));
-}
-
-public int read(byte b[]) throws IOException {
-	throw new IOException("not required");
-}
-
-public int read(byte b[], int off, int len) throws IOException {
-	throw new IOException("not required");
-}
-
-public int read() throws IOException {
-	throw new IOException("not required");
-}
-
-public long skip(long n) throws IOException {
-	throw new IOException("not required");
-}
-
-public int available() throws IOException {
-	throw new IOException("not required");
-}
-
-public void readFully(byte b[]) throws IOException {
-	throw new IOException("not required");
-}
-
-public void readFully(byte b[], int off, int len) throws IOException {
-	throw new IOException("not required");
-}
-
-public String readLine() throws IOException {
-	throw new IOException("not required");
-}
-
-public String readUTF() throws IOException {
-	throw new IOException("not required");
-}
-
-public int readUnsignedByte() throws IOException {
-	throw new IOException("not required");
-}
-
-public int readUnsignedShort() throws IOException {
-	throw new IOException("not required");
-}
-
-public int skipBytes(int n) throws IOException {
-	throw new IOException("not required");
-}
-
-public void close() throws IOException {
-}
-
-}
+public class UnicastRemoteCall implements RemoteCall
+{
+
+  private UnicastConnection conn;
+  private Object result;
+  private Object object;
+  private int opnum;
+  private long hash;
+  private Vector vec;
+  private int ptr;
+
+  /**
+   * Incoming call.
+   */
+  UnicastRemoteCall(UnicastConnection conn)
+  {
+    this.conn = conn;
+  }
+
+  /**
+   * Outgoing call.
+   */
+  UnicastRemoteCall(Object obj, int opnum, long hash)
+  {
+    this.object = obj;
+    this.opnum = opnum;
+    this.hash = hash;
+  }
+
+  public ObjectOutput getOutputStream() throws IOException
+  {
+    vec = new Vector();
+    return new DummyObjectOutputStream();
+  }
+
+  public void releaseOutputStream() throws IOException
+  {
+    // Does nothing.
+  }
+
+  public ObjectInput getInputStream() throws IOException
+  {
+    if (conn != null)
+      return conn.getObjectInputStream();
+    ptr = 0;
+    return new DummyObjectInputStream();
+  }
+
+  public void releaseInputStream() throws IOException
+  {
+    // Does nothing.
+  }
+
+  public ObjectOutput getResultStream(boolean success)
+    throws IOException, StreamCorruptedException
+  {
+    vec = new Vector();
+    return new DummyObjectOutputStream();
+  }
+
+  public void executeCall() throws Exception
+  {
+    throw new Error("Not implemented");
+  }
+
+  public void done() throws IOException
+  {
+    /* Does nothing */
+  }
+
+  Object returnValue()
+  {
+    return vec.elementAt(0);
+  }
+
+  Object[] getArguments()
+  {
+    return vec.toArray();
+  }
+
+  Object getObject()
+  {
+    return object;
+  }
+
+  int getOpnum()
+  {
+    return opnum;
+  }
+
+  long getHash()
+  {
+    return hash;
+  }
+
+  void setReturnValue(Object obj)
+  {
+    vec.removeAllElements();
+    vec.addElement(obj);
+  }
+
+  /**
+   * Dummy object output class.
+   */
+  private class DummyObjectOutputStream implements ObjectOutput
+  {
+    /**
+     * Non-private constructor to reduce bytecode emitted.
+     */
+    DummyObjectOutputStream()
+    {
+    }
+
+    public void writeBoolean(boolean v) throws IOException
+    {
+      vec.addElement(new Boolean(v));
+    }
+
+    public void writeByte(int v) throws IOException
+    {
+      vec.addElement(new Byte((byte) v));
+    }
+
+    public void writeChar(int v) throws IOException
+    {
+      vec.addElement(new Character((char) v));
+    }
+
+    public void writeDouble(double v) throws IOException
+    {
+      vec.addElement(new Double(v));
+    }
+
+    public void writeFloat(float v) throws IOException
+    {
+      vec.addElement(new Float(v));
+    }
+
+    public void writeInt(int v) throws IOException
+    {
+      vec.addElement(new Integer(v));
+    }
+
+    public void writeLong(long v) throws IOException
+    {
+      vec.addElement(new Long(v));
+    }
+
+    public void writeShort(int v) throws IOException
+    {
+      vec.addElement(new Short((short) v));
+    }
+
+    public void writeObject(Object obj) throws IOException
+    {
+      vec.addElement(obj);
+    }
+
+    public void write(byte b[]) throws IOException
+    {
+      throw new IOException("not required");
+    }
+
+    public void write(byte b[], int off, int len) throws IOException
+    {
+      throw new IOException("not required");
+    }
+
+    public void write(int b) throws IOException
+    {
+      throw new IOException("not required");
+    }
+
+    public void writeBytes(String s) throws IOException
+    {
+      throw new IOException("not required");
+    }
+
+    public void writeChars(String s) throws IOException
+    {
+      throw new IOException("not required");
+    }
+
+    public void writeUTF(String str) throws IOException
+    {
+      throw new IOException("not required");
+    }
+
+    public void flush() throws IOException
+    {
+    }
+
+    public void close() throws IOException
+    {
+    }
+  } // class DummyObjectOutputStream
+
+  /**
+   * Dummy object input class.
+   */
+  private class DummyObjectInputStream implements ObjectInput
+  {
+    /**
+     * Non-private constructor to reduce bytecode emitted.
+     */
+    DummyObjectInputStream()
+    {
+    }
+
+    public boolean readBoolean() throws IOException
+    {
+      Object obj = vec.elementAt(ptr++);
+      return ((Boolean) obj).booleanValue();
+    }
+
+    public byte readByte() throws IOException
+    {
+      Object obj = vec.elementAt(ptr++);
+      return ((Byte) obj).byteValue();
+    }
+
+    public char readChar() throws IOException
+    {
+      Object obj = vec.elementAt(ptr++);
+      return ((Character) obj).charValue();
+    }
+
+    public double readDouble() throws IOException
+    {
+      Object obj = vec.elementAt(ptr++);
+      return ((Double) obj).doubleValue();
+    }
+
+    public float readFloat() throws IOException
+    {
+      Object obj = vec.elementAt(ptr++);
+      return ((Float) obj).floatValue();
+    }
+
+    public int readInt() throws IOException
+    {
+      Object obj = vec.elementAt(ptr++);
+      return ((Integer) obj).intValue();
+    }
+
+    public long readLong() throws IOException
+    {
+      Object obj = vec.elementAt(ptr++);
+      return ((Long) obj).longValue();
+    }
+
+    public short readShort() throws IOException
+    {
+      Object obj = vec.elementAt(ptr++);
+      return ((Short) obj).shortValue();
+    }
+
+    public Object readObject() throws IOException
+    {
+      return vec.elementAt(ptr++);
+    }
+
+    public int read(byte b[]) throws IOException
+    {
+      throw new IOException("not required");
+    }
+
+    public int read(byte b[], int off, int len) throws IOException
+    {
+      throw new IOException("not required");
+    }
+
+    public int read() throws IOException
+    {
+      throw new IOException("not required");
+    }
+
+    public long skip(long n) throws IOException
+    {
+      throw new IOException("not required");
+    }
+
+    public int available() throws IOException
+    {
+      throw new IOException("not required");
+    }
+
+    public void readFully(byte b[]) throws IOException
+    {
+      throw new IOException("not required");
+    }
+
+    public void readFully(byte b[], int off, int len) throws IOException
+    {
+      throw new IOException("not required");
+    }
+
+    public String readLine() throws IOException
+    {
+      throw new IOException("not required");
+    }
+
+    public String readUTF() throws IOException
+    {
+      throw new IOException("not required");
+    }
+
+    public int readUnsignedByte() throws IOException
+    {
+      throw new IOException("not required");
+    }
+
+    public int readUnsignedShort() throws IOException
+    {
+      throw new IOException("not required");
+    }
+
+    public int skipBytes(int n) throws IOException
+    {
+      throw new IOException("not required");
+    }
+
+    public void close() throws IOException
+    {
+    }
+  } // class DummyObjectInputStream
 
 }