[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: small cleanups in rmi and io

Kaffe CVS cvs-commits at kaffe.org
Mon Oct 4 07:50:12 PDT 2004


PatchSet 5247 
Date: 2004/10/04 14:46:18
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: small cleanups in rmi and io

2004-10-04  Dalibor Topic  <robilad at kaffe.org>

        * libraries/javalib/gnu/java/rmi/rmic/RMIC.java,
        libraries/javalib/gnu/java/rmi/server/RMIDefaultSocketFactory.java,
        libraries/javalib/gnu/java/rmi/server/RMIHashes.java,
        libraries/javalib/gnu/java/rmi/server/RMIObjectInputStream.java,
        libraries/javalib/gnu/java/rmi/server/RMIObjectOutputStream.java,
        libraries/javalib/gnu/java/rmi/server/UnicastConnection.java,
        libraries/javalib/gnu/java/rmi/server/UnicastConnectionManager.java,
        libraries/javalib/gnu/java/rmi/server/UnicastRemoteCall.java,
        libraries/javalib/gnu/java/rmi/server/UnicastRemoteStub.java,
        libraries/javalib/gnu/java/rmi/server/UnicastServerRef.java,
        libraries/javalib/java/io/CharArrayWriter.java,
        libraries/javalib/java/io/FileDescriptor.java,
        libraries/javalib/java/io/FileInputStream.java,
        libraries/javalib/java/io/FileOutputStream.java,
        libraries/javalib/java/io/ObjectOutputStream.java,
        libraries/javalib/java/io/ObjectStreamClass.java,
        libraries/javalib/java/io/PipedInputStream.java,
        libraries/javalib/java/io/RandomAccessFile.java:
        Resynced with GNU Classpath.

        2004-10-02  Michael Koch  <konqueror at gmx.de>

        * java/io/CharArrayWriter.java
        (resize): Remove redundant final modifier.
        * java/io/FileDescriptor.java,
        java/io/FileInputStream.java,
        java/io/FileOutputStream.java,
        java/io/ObjectOutputStream.java,
        java/io/ObjectStreamClass.java,
        java/io/PipedInputStream.java,
        java/io/RandomAccessFile.java:
        Reworked import statements.
        2004-10-02  Michael Koch  <konqueror at gmx.de>

        * gnu/java/rmi/rmic/RMIC.java,
        gnu/java/rmi/server/RMIHashes.java,
        gnu/java/rmi/server/RMIObjectInputStream.java,
        gnu/java/rmi/server/UnicastConnection.java,
        gnu/java/rmi/server/UnicastConnectionManager.java,
        gnu/java/rmi/server/UnicastRemoteCall.java,
        gnu/java/rmi/server/UnicastServerRef.java:
        Import statements cleaned up.

Members: 
	ChangeLog:1.2801->1.2802 
	libraries/javalib/gnu/java/rmi/rmic/RMIC.java:1.4->1.5 
	libraries/javalib/gnu/java/rmi/server/RMIDefaultSocketFactory.java:1.2->1.3 
	libraries/javalib/gnu/java/rmi/server/RMIHashes.java:1.2->1.3 
	libraries/javalib/gnu/java/rmi/server/RMIObjectInputStream.java:1.2->1.3 
	libraries/javalib/gnu/java/rmi/server/RMIObjectOutputStream.java:1.2->1.3 
	libraries/javalib/gnu/java/rmi/server/UnicastConnection.java:1.3->1.4 
	libraries/javalib/gnu/java/rmi/server/UnicastConnectionManager.java:1.4->1.5 
	libraries/javalib/gnu/java/rmi/server/UnicastRemoteCall.java:1.5->1.6 
	libraries/javalib/gnu/java/rmi/server/UnicastRemoteStub.java:1.2->1.3 
	libraries/javalib/gnu/java/rmi/server/UnicastServerRef.java:1.6->1.7 
	libraries/javalib/java/io/CharArrayWriter.java:1.9->1.10 
	libraries/javalib/java/io/FileDescriptor.java:1.8->1.9 
	libraries/javalib/java/io/FileInputStream.java:1.17->1.18 
	libraries/javalib/java/io/FileOutputStream.java:1.14->1.15 
	libraries/javalib/java/io/ObjectOutputStream.java:1.23->1.24 
	libraries/javalib/java/io/ObjectStreamClass.java:1.25->1.26 
	libraries/javalib/java/io/PipedInputStream.java:1.14->1.15 
	libraries/javalib/java/io/RandomAccessFile.java:1.26->1.27 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2801 kaffe/ChangeLog:1.2802
--- kaffe/ChangeLog:1.2801	Mon Oct  4 14:15:24 2004
+++ kaffe/ChangeLog	Mon Oct  4 14:46:18 2004
@@ -1,5 +1,51 @@
 2004-10-04  Dalibor Topic  <robilad at kaffe.org>
 
+	* libraries/javalib/gnu/java/rmi/rmic/RMIC.java,
+	libraries/javalib/gnu/java/rmi/server/RMIDefaultSocketFactory.java,
+	libraries/javalib/gnu/java/rmi/server/RMIHashes.java,
+	libraries/javalib/gnu/java/rmi/server/RMIObjectInputStream.java,
+	libraries/javalib/gnu/java/rmi/server/RMIObjectOutputStream.java,
+	libraries/javalib/gnu/java/rmi/server/UnicastConnection.java,
+	libraries/javalib/gnu/java/rmi/server/UnicastConnectionManager.java,
+	libraries/javalib/gnu/java/rmi/server/UnicastRemoteCall.java,
+	libraries/javalib/gnu/java/rmi/server/UnicastRemoteStub.java,
+	libraries/javalib/gnu/java/rmi/server/UnicastServerRef.java,
+	libraries/javalib/java/io/CharArrayWriter.java,
+	libraries/javalib/java/io/FileDescriptor.java,
+	libraries/javalib/java/io/FileInputStream.java,
+	libraries/javalib/java/io/FileOutputStream.java,
+	libraries/javalib/java/io/ObjectOutputStream.java,
+	libraries/javalib/java/io/ObjectStreamClass.java,
+	libraries/javalib/java/io/PipedInputStream.java,
+	libraries/javalib/java/io/RandomAccessFile.java:
+	Resynced with GNU Classpath.
+
+	2004-10-02  Michael Koch  <konqueror at gmx.de>
+
+        * java/io/CharArrayWriter.java
+        (resize): Remove redundant final modifier.
+        * java/io/FileDescriptor.java,
+        java/io/FileInputStream.java,
+        java/io/FileOutputStream.java,
+        java/io/ObjectOutputStream.java,
+        java/io/ObjectStreamClass.java,
+        java/io/PipedInputStream.java,
+        java/io/RandomAccessFile.java:
+        Reworked import statements.
+
+	2004-10-02  Michael Koch  <konqueror at gmx.de>
+
+        * gnu/java/rmi/rmic/RMIC.java,
+        gnu/java/rmi/server/RMIHashes.java,
+        gnu/java/rmi/server/RMIObjectInputStream.java,
+        gnu/java/rmi/server/UnicastConnection.java,
+        gnu/java/rmi/server/UnicastConnectionManager.java,
+        gnu/java/rmi/server/UnicastRemoteCall.java,
+        gnu/java/rmi/server/UnicastServerRef.java:
+        Import statements cleaned up.
+
+2004-10-04  Dalibor Topic  <robilad at kaffe.org>
+
 	* libraries/javalib/java/io/DataInputStream.java:
 	Resynced with GNU Classpath.
 
Index: kaffe/libraries/javalib/gnu/java/rmi/rmic/RMIC.java
diff -u kaffe/libraries/javalib/gnu/java/rmi/rmic/RMIC.java:1.4 kaffe/libraries/javalib/gnu/java/rmi/rmic/RMIC.java:1.5
--- kaffe/libraries/javalib/gnu/java/rmi/rmic/RMIC.java:1.4	Mon Jul 26 21:13:53 2004
+++ kaffe/libraries/javalib/gnu/java/rmi/rmic/RMIC.java	Mon Oct  4 14:46:20 2004
@@ -1,5 +1,6 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999, 2001, 2002, 2003 Free Software Foundation, Inc.
+/* RMIC.java --
+   Copyright (c) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004
+   Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -7,7 +8,7 @@
 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
@@ -37,19 +38,18 @@
 
 package gnu.java.rmi.rmic;
 
+import gnu.java.rmi.server.RMIHashes;
 import java.io.File;
 import java.io.FileWriter;
-import java.io.PrintWriter;
 import java.io.IOException;
+import java.io.PrintWriter;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.rmi.RemoteException;
+import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Iterator;
-import java.util.Arrays;
 import java.util.Set;
-
-import gnu.java.rmi.server.RMIHashes;
 
 public class RMIC {
 
Index: kaffe/libraries/javalib/gnu/java/rmi/server/RMIDefaultSocketFactory.java
diff -u kaffe/libraries/javalib/gnu/java/rmi/server/RMIDefaultSocketFactory.java:1.2 kaffe/libraries/javalib/gnu/java/rmi/server/RMIDefaultSocketFactory.java:1.3
--- kaffe/libraries/javalib/gnu/java/rmi/server/RMIDefaultSocketFactory.java:1.2	Mon Mar 22 11:24:23 2004
+++ kaffe/libraries/javalib/gnu/java/rmi/server/RMIDefaultSocketFactory.java	Mon Oct  4 14:46:20 2004
@@ -37,10 +37,10 @@
 
 package gnu.java.rmi.server;
 
+import java.rmi.server.RMISocketFactory;
 import java.io.IOException;
-import java.net.ServerSocket;
 import java.net.Socket;
-import java.rmi.server.RMISocketFactory;
+import java.net.ServerSocket;
 
 public class RMIDefaultSocketFactory
 	extends RMISocketFactory {
Index: kaffe/libraries/javalib/gnu/java/rmi/server/RMIHashes.java
diff -u kaffe/libraries/javalib/gnu/java/rmi/server/RMIHashes.java:1.2 kaffe/libraries/javalib/gnu/java/rmi/server/RMIHashes.java:1.3
--- kaffe/libraries/javalib/gnu/java/rmi/server/RMIHashes.java:1.2	Mon Mar 22 11:24:23 2004
+++ kaffe/libraries/javalib/gnu/java/rmi/server/RMIHashes.java	Mon Oct  4 14:46:20 2004
@@ -37,12 +37,13 @@
 
 package gnu.java.rmi.server;
 
-import gnu.java.lang.reflect.TypeSignature;
-
-import java.io.ByteArrayOutputStream;
-import java.io.DataOutputStream;
 import java.lang.reflect.Method;
+import gnu.java.io.NullOutputStream;
+import gnu.java.lang.reflect.TypeSignature;
 import java.security.MessageDigest;
+import java.security.DigestOutputStream;
+import java.io.DataOutputStream;
+import java.io.ByteArrayOutputStream;
 
 public class RMIHashes
 {
Index: kaffe/libraries/javalib/gnu/java/rmi/server/RMIObjectInputStream.java
diff -u kaffe/libraries/javalib/gnu/java/rmi/server/RMIObjectInputStream.java:1.2 kaffe/libraries/javalib/gnu/java/rmi/server/RMIObjectInputStream.java:1.3
--- kaffe/libraries/javalib/gnu/java/rmi/server/RMIObjectInputStream.java:1.2	Mon Mar 22 11:24:23 2004
+++ kaffe/libraries/javalib/gnu/java/rmi/server/RMIObjectInputStream.java	Mon Oct  4 14:46:20 2004
@@ -37,11 +37,12 @@
 
 package gnu.java.rmi.server;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.ObjectInputStream;
 import java.io.ObjectStreamClass;
+import java.io.ObjectInputStream;
+import java.io.InputStream;
+import java.io.IOException;
 import java.lang.reflect.Proxy;
+import java.net.URL;
 import java.net.MalformedURLException;
 import java.rmi.server.RMIClassLoader;
 
Index: kaffe/libraries/javalib/gnu/java/rmi/server/RMIObjectOutputStream.java
diff -u kaffe/libraries/javalib/gnu/java/rmi/server/RMIObjectOutputStream.java:1.2 kaffe/libraries/javalib/gnu/java/rmi/server/RMIObjectOutputStream.java:1.3
--- kaffe/libraries/javalib/gnu/java/rmi/server/RMIObjectOutputStream.java:1.2	Mon Mar 22 11:24:23 2004
+++ kaffe/libraries/javalib/gnu/java/rmi/server/RMIObjectOutputStream.java	Mon Oct  4 14:46:20 2004
@@ -37,12 +37,13 @@
 
 package gnu.java.rmi.server;
 
-import java.io.IOException;
 import java.io.ObjectOutputStream;
 import java.io.OutputStream;
-import java.rmi.Remote;
+import java.io.IOException;
 import java.rmi.server.RMIClassLoader;
+import java.rmi.Remote;
 import java.rmi.server.RemoteStub;
+import java.rmi.server.ObjID;
 
 public class RMIObjectOutputStream
 	extends ObjectOutputStream {
Index: kaffe/libraries/javalib/gnu/java/rmi/server/UnicastConnection.java
diff -u kaffe/libraries/javalib/gnu/java/rmi/server/UnicastConnection.java:1.3 kaffe/libraries/javalib/gnu/java/rmi/server/UnicastConnection.java:1.4
--- kaffe/libraries/javalib/gnu/java/rmi/server/UnicastConnection.java:1.3	Mon Mar 22 11:24:23 2004
+++ kaffe/libraries/javalib/gnu/java/rmi/server/UnicastConnection.java	Mon Oct  4 14:46:20 2004
@@ -37,14 +37,17 @@
 
 package gnu.java.rmi.server;
 
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
-import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.ObjectOutput;
+import java.io.ObjectInput;
+import java.io.IOException;
 import java.net.Socket;
+import java.net.ServerSocket;
 import java.rmi.RemoteException;
 
 public class UnicastConnection 
Index: kaffe/libraries/javalib/gnu/java/rmi/server/UnicastConnectionManager.java
diff -u kaffe/libraries/javalib/gnu/java/rmi/server/UnicastConnectionManager.java:1.4 kaffe/libraries/javalib/gnu/java/rmi/server/UnicastConnectionManager.java:1.5
--- kaffe/libraries/javalib/gnu/java/rmi/server/UnicastConnectionManager.java:1.4	Mon Mar 22 11:24:23 2004
+++ kaffe/libraries/javalib/gnu/java/rmi/server/UnicastConnectionManager.java	Mon Oct  4 14:46:20 2004
@@ -1,5 +1,6 @@
 /*
-  Copyright (c) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc.
+  Copyright (c) 1996, 1997, 1998, 1999, 2002i, 2004
+  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,21 +38,26 @@
 
 package gnu.java.rmi.server;
 
+import java.rmi.server.RMISocketFactory;
+import java.rmi.server.RMIServerSocketFactory;
+import java.rmi.server.RMIClientSocketFactory;
+import java.rmi.RemoteException;
 import java.io.IOException;
-import java.io.ObjectInput;
 import java.io.ObjectOutput;
+import java.io.ObjectInput;
+import java.io.DataInputStream;
 import java.net.InetAddress;
-import java.net.ServerSocket;
 import java.net.Socket;
+import java.net.ServerSocket;
 import java.net.UnknownHostException;
-import java.rmi.RemoteException;
-import java.rmi.server.RMIClientSocketFactory;
-import java.rmi.server.RMIServerSocketFactory;
-import java.rmi.server.RMISocketFactory;
 import java.util.ArrayList;
 import java.util.ConcurrentModificationException;
+import java.util.Enumeration;
 import java.util.Hashtable;
 import java.util.Iterator;
+
+import gnu.java.rmi.server.UnicastConnection;
+import gnu.java.rmi.server.RMIIncomingThread;
 
 public class UnicastConnectionManager
 	implements Runnable, ProtocolConstants {
Index: kaffe/libraries/javalib/gnu/java/rmi/server/UnicastRemoteCall.java
diff -u kaffe/libraries/javalib/gnu/java/rmi/server/UnicastRemoteCall.java:1.5 kaffe/libraries/javalib/gnu/java/rmi/server/UnicastRemoteCall.java:1.6
--- kaffe/libraries/javalib/gnu/java/rmi/server/UnicastRemoteCall.java:1.5	Mon Mar 22 11:24:23 2004
+++ kaffe/libraries/javalib/gnu/java/rmi/server/UnicastRemoteCall.java	Mon Oct  4 14:46:21 2004
@@ -40,15 +40,17 @@
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
-import java.io.ObjectInput;
 import java.io.ObjectOutput;
+import java.io.ObjectInput;
 import java.io.StreamCorruptedException;
-import java.rmi.MarshalException;
+import java.rmi.server.RemoteCall;
 import java.rmi.RemoteException;
+import java.rmi.MarshalException;
 import java.rmi.UnmarshalException;
-import java.rmi.server.ObjID;
-import java.rmi.server.RemoteCall;
 import java.rmi.server.UID;
+import java.rmi.server.ObjID;
+import java.rmi.server.RemoteObject;
+
 import java.util.Vector;
 
 public class UnicastRemoteCall
Index: kaffe/libraries/javalib/gnu/java/rmi/server/UnicastRemoteStub.java
diff -u kaffe/libraries/javalib/gnu/java/rmi/server/UnicastRemoteStub.java:1.2 kaffe/libraries/javalib/gnu/java/rmi/server/UnicastRemoteStub.java:1.3
--- kaffe/libraries/javalib/gnu/java/rmi/server/UnicastRemoteStub.java:1.2	Mon Mar 22 11:24:23 2004
+++ kaffe/libraries/javalib/gnu/java/rmi/server/UnicastRemoteStub.java	Mon Oct  4 14:46:21 2004
@@ -37,8 +37,8 @@
 
 package gnu.java.rmi.server;
 
-import java.rmi.server.RemoteRef;
 import java.rmi.server.RemoteStub;
+import java.rmi.server.RemoteRef;
 
 public class UnicastRemoteStub
 	extends RemoteStub {
Index: kaffe/libraries/javalib/gnu/java/rmi/server/UnicastServerRef.java
diff -u kaffe/libraries/javalib/gnu/java/rmi/server/UnicastServerRef.java:1.6 kaffe/libraries/javalib/gnu/java/rmi/server/UnicastServerRef.java:1.7
--- kaffe/libraries/javalib/gnu/java/rmi/server/UnicastServerRef.java:1.6	Tue Sep 21 12:05:13 2004
+++ kaffe/libraries/javalib/gnu/java/rmi/server/UnicastServerRef.java	Mon Oct  4 14:46:21 2004
@@ -1,5 +1,6 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999, 2002, 2003 Free Software Foundation, Inc.
+/* UnicastServerRef.java --
+   Copyright (c) 1996, 1997, 1998, 1999, 2002, 2003, 2004
+   Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -57,8 +58,6 @@
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 import java.lang.reflect.InvocationTargetException;
-import java.lang.Thread;
-import java.lang.Exception;
 import java.io.IOException;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
Index: kaffe/libraries/javalib/java/io/CharArrayWriter.java
diff -u kaffe/libraries/javalib/java/io/CharArrayWriter.java:1.9 kaffe/libraries/javalib/java/io/CharArrayWriter.java:1.10
--- kaffe/libraries/javalib/java/io/CharArrayWriter.java:1.9	Tue May 18 03:35:03 2004
+++ kaffe/libraries/javalib/java/io/CharArrayWriter.java	Mon Oct  4 14:46:23 2004
@@ -249,7 +249,7 @@
    * application programmers by setting their initial buffer size big
    * enough to hold everything if possible.
    */
-  private final void resize (int len)
+  private void resize (int len)
   {
     if (count + len >= buf.length)
       {
Index: kaffe/libraries/javalib/java/io/FileDescriptor.java
diff -u kaffe/libraries/javalib/java/io/FileDescriptor.java:1.8 kaffe/libraries/javalib/java/io/FileDescriptor.java:1.9
--- kaffe/libraries/javalib/java/io/FileDescriptor.java:1.8	Tue May 18 03:35:05 2004
+++ kaffe/libraries/javalib/java/io/FileDescriptor.java	Mon Oct  4 14:46:23 2004
@@ -39,9 +39,10 @@
 
 package java.io;
 
+import gnu.java.nio.channels.FileChannelImpl;
+
 import java.nio.channels.ByteChannel;
 import java.nio.channels.FileChannel;
-import gnu.java.nio.channels.FileChannelImpl;
 
 /**
  * This class represents an opaque file handle as a Java class.  It should
Index: kaffe/libraries/javalib/java/io/FileInputStream.java
diff -u kaffe/libraries/javalib/java/io/FileInputStream.java:1.17 kaffe/libraries/javalib/java/io/FileInputStream.java:1.18
--- kaffe/libraries/javalib/java/io/FileInputStream.java:1.17	Mon Apr 12 11:40:26 2004
+++ kaffe/libraries/javalib/java/io/FileInputStream.java	Mon Oct  4 14:46:23 2004
@@ -38,8 +38,9 @@
 
 package java.io;
 
-import java.nio.channels.FileChannel;
 import gnu.java.nio.channels.FileChannelImpl;
+
+import java.nio.channels.FileChannel;
 
 /* Written using "Java Class Libraries", 2nd edition, ISBN 0-201-31002-3
  * "The Java Language Specification", ISBN 0-201-63451-1
Index: kaffe/libraries/javalib/java/io/FileOutputStream.java
diff -u kaffe/libraries/javalib/java/io/FileOutputStream.java:1.14 kaffe/libraries/javalib/java/io/FileOutputStream.java:1.15
--- kaffe/libraries/javalib/java/io/FileOutputStream.java:1.14	Fri Apr 16 14:55:22 2004
+++ kaffe/libraries/javalib/java/io/FileOutputStream.java	Mon Oct  4 14:46:23 2004
@@ -38,8 +38,9 @@
 
 package java.io;
 
-import java.nio.channels.FileChannel;
 import gnu.java.nio.channels.FileChannelImpl;
+
+import java.nio.channels.FileChannel;
 
 /* Written using "Java Class Libraries", 2nd edition, ISBN 0-201-31002-3
  * "The Java Language Specification", ISBN 0-201-63451-1
Index: kaffe/libraries/javalib/java/io/ObjectOutputStream.java
diff -u kaffe/libraries/javalib/java/io/ObjectOutputStream.java:1.23 kaffe/libraries/javalib/java/io/ObjectOutputStream.java:1.24
--- kaffe/libraries/javalib/java/io/ObjectOutputStream.java:1.23	Tue Sep 28 18:37:53 2004
+++ kaffe/libraries/javalib/java/io/ObjectOutputStream.java	Mon Oct  4 14:46:23 2004
@@ -1,5 +1,6 @@
 /* ObjectOutputStream.java -- Class used to write serialized objects
-   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004
+   Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,18 +39,17 @@
 
 package java.io;
 
+import gnu.classpath.Configuration;
+import gnu.java.io.ObjectIdentityWrapper;
+import gnu.java.lang.reflect.TypeSignature;
+import gnu.java.security.action.SetAccessibleAction;
+
 import java.lang.reflect.Array;
 import java.lang.reflect.Field;
-import java.lang.reflect.Method;
 import java.lang.reflect.InvocationTargetException;
-import java.security.PrivilegedAction;
+import java.lang.reflect.Method;
 import java.security.AccessController;
 import java.util.Hashtable;
-
-import gnu.java.io.ObjectIdentityWrapper;
-import gnu.java.lang.reflect.TypeSignature;
-import gnu.java.security.action.SetAccessibleAction;
-import gnu.classpath.Configuration;
 
 /**
  * An <code>ObjectOutputStream</code> can be used to write objects
Index: kaffe/libraries/javalib/java/io/ObjectStreamClass.java
diff -u kaffe/libraries/javalib/java/io/ObjectStreamClass.java:1.25 kaffe/libraries/javalib/java/io/ObjectStreamClass.java:1.26
--- kaffe/libraries/javalib/java/io/ObjectStreamClass.java:1.25	Mon Jul 26 21:13:56 2004
+++ kaffe/libraries/javalib/java/io/ObjectStreamClass.java	Mon Oct  4 14:46:23 2004
@@ -2,43 +2,48 @@
    about serialized objects.
    Copyright (C) 1998, 1999, 2000, 2001, 2003  Free Software Foundation, Inc.
 
-   This file is part of GNU Classpath.
+This file is part of GNU Classpath.
 
-   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 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
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with GNU Classpath; see the file COPYING.  If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.
-
-   Linking this library statically or dynamically with other modules is
-   making a combined work based on this library.  Thus, the terms and
-   conditions of the GNU General Public License cover the whole
-   combination.
-
-   As a special exception, the copyright holders of this library give you
-   permission to link this library with independent modules to produce an
-   executable, regardless of the license terms of these independent
-   modules, and to copy and distribute the resulting executable under
-   terms of your choice, provided that you also meet, for each linked
-   independent module, the terms and conditions of the license of that
-   module.  An independent module is a module which is not derived from
-   or based on this library.  If you modify this library, you may extend
-   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. */
+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
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+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 java.io;
 
+import gnu.java.io.NullOutputStream;
+import gnu.java.lang.reflect.TypeSignature;
+import gnu.java.security.action.SetAccessibleAction;
+import gnu.java.security.provider.Gnu;
+
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.Member;
@@ -55,11 +60,6 @@
 import java.util.Comparator;
 import java.util.Hashtable;
 import java.util.Vector;
-import gnu.java.io.NullOutputStream;
-import gnu.java.lang.reflect.TypeSignature;
-import gnu.java.security.action.SetAccessibleAction;
-//import gnu.java.security.provider.Gnu;
-
 
 public class ObjectStreamClass implements Serializable
 {
@@ -663,10 +663,9 @@
 	catch (NoSuchAlgorithmException e)
 	  {
 	    // If a provider already provides SHA, use it; otherwise, use this.
-	    //Gnu gnuProvider = new Gnu();
-	    //Security.addProvider(gnuProvider);
-	    //md = MessageDigest.getInstance("SHA");
-	    throw e;
+	    Gnu gnuProvider = new Gnu();
+	    Security.addProvider(gnuProvider);
+	    md = MessageDigest.getInstance("SHA");
 	  }
 
 	DigestOutputStream digest_out =
Index: kaffe/libraries/javalib/java/io/PipedInputStream.java
diff -u kaffe/libraries/javalib/java/io/PipedInputStream.java:1.14 kaffe/libraries/javalib/java/io/PipedInputStream.java:1.15
--- kaffe/libraries/javalib/java/io/PipedInputStream.java:1.14	Tue May 18 03:35:07 2004
+++ kaffe/libraries/javalib/java/io/PipedInputStream.java	Mon Oct  4 14:46:23 2004
@@ -35,11 +35,11 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+package java.io;
+
 // NOTE: This implementation is very similar to that of PipedReader.  If you 
 // fix a bug in here, chances are you should make a similar change to the 
 // PipedReader code.
-
-package java.io;
 
 /**
   * An input stream that reads its bytes from an output stream
Index: kaffe/libraries/javalib/java/io/RandomAccessFile.java
diff -u kaffe/libraries/javalib/java/io/RandomAccessFile.java:1.26 kaffe/libraries/javalib/java/io/RandomAccessFile.java:1.27
--- kaffe/libraries/javalib/java/io/RandomAccessFile.java:1.26	Thu Jun  3 21:38:52 2004
+++ kaffe/libraries/javalib/java/io/RandomAccessFile.java	Mon Oct  4 14:46:23 2004
@@ -38,8 +38,9 @@
 
 package java.io;
 
-import java.nio.channels.FileChannel;
 import gnu.java.nio.channels.FileChannelImpl;
+
+import java.nio.channels.FileChannel;
 
 /* Written using "Java Class Libraries", 2nd edition, ISBN 0-201-31002-3
  * "The Java Language Specification", ISBN 0-201-63451-1



More information about the kaffe mailing list