Menu
▾
▴
[Jnode-svn-commits] SF.net SVN: jnode:[5806] classlib6/core/src/openjdk/java/java/io
|
From: <ls...@us...> - 2011-03-06 19:18:08
|
Revision: 5806
http://jnode.svn.sourceforge.net/jnode/?rev=5806&view=rev
Author: lsantha
Date: 2011-03-06 19:17:58 +0000 (Sun, 06 Mar 2011)
Log Message:
-----------
Integrating OpenJDK 6 b22.
Modified Paths:
--------------
classlib6/core/src/openjdk/java/java/io/Bits.java
classlib6/core/src/openjdk/java/java/io/BufferedInputStream.java
classlib6/core/src/openjdk/java/java/io/BufferedOutputStream.java
classlib6/core/src/openjdk/java/java/io/BufferedReader.java
classlib6/core/src/openjdk/java/java/io/BufferedWriter.java
classlib6/core/src/openjdk/java/java/io/ByteArrayInputStream.java
classlib6/core/src/openjdk/java/java/io/ByteArrayOutputStream.java
classlib6/core/src/openjdk/java/java/io/CharArrayReader.java
classlib6/core/src/openjdk/java/java/io/CharArrayWriter.java
classlib6/core/src/openjdk/java/java/io/CharConversionException.java
classlib6/core/src/openjdk/java/java/io/Closeable.java
classlib6/core/src/openjdk/java/java/io/DataInputStream.java
classlib6/core/src/openjdk/java/java/io/DataOutputStream.java
classlib6/core/src/openjdk/java/java/io/DeleteOnExitHook.java
classlib6/core/src/openjdk/java/java/io/EOFException.java
classlib6/core/src/openjdk/java/java/io/ExpiringCache.java
classlib6/core/src/openjdk/java/java/io/Externalizable.java
classlib6/core/src/openjdk/java/java/io/File.java
classlib6/core/src/openjdk/java/java/io/FileFilter.java
classlib6/core/src/openjdk/java/java/io/FileNotFoundException.java
classlib6/core/src/openjdk/java/java/io/FileReader.java
classlib6/core/src/openjdk/java/java/io/FileSystem.java
classlib6/core/src/openjdk/java/java/io/FileWriter.java
classlib6/core/src/openjdk/java/java/io/FilenameFilter.java
classlib6/core/src/openjdk/java/java/io/FilterInputStream.java
classlib6/core/src/openjdk/java/java/io/FilterOutputStream.java
classlib6/core/src/openjdk/java/java/io/FilterReader.java
classlib6/core/src/openjdk/java/java/io/FilterWriter.java
classlib6/core/src/openjdk/java/java/io/Flushable.java
classlib6/core/src/openjdk/java/java/io/IOException.java
classlib6/core/src/openjdk/java/java/io/InputStream.java
classlib6/core/src/openjdk/java/java/io/InputStreamReader.java
classlib6/core/src/openjdk/java/java/io/InterruptedIOException.java
classlib6/core/src/openjdk/java/java/io/InvalidClassException.java
classlib6/core/src/openjdk/java/java/io/InvalidObjectException.java
classlib6/core/src/openjdk/java/java/io/LineNumberInputStream.java
classlib6/core/src/openjdk/java/java/io/LineNumberReader.java
classlib6/core/src/openjdk/java/java/io/NotActiveException.java
classlib6/core/src/openjdk/java/java/io/NotSerializableException.java
classlib6/core/src/openjdk/java/java/io/ObjectInput.java
classlib6/core/src/openjdk/java/java/io/ObjectInputStream.java
classlib6/core/src/openjdk/java/java/io/ObjectInputValidation.java
classlib6/core/src/openjdk/java/java/io/ObjectOutput.java
classlib6/core/src/openjdk/java/java/io/ObjectOutputStream.java
classlib6/core/src/openjdk/java/java/io/ObjectStreamClass.java
classlib6/core/src/openjdk/java/java/io/ObjectStreamConstants.java
classlib6/core/src/openjdk/java/java/io/ObjectStreamException.java
classlib6/core/src/openjdk/java/java/io/ObjectStreamField.java
classlib6/core/src/openjdk/java/java/io/OptionalDataException.java
classlib6/core/src/openjdk/java/java/io/OutputStream.java
classlib6/core/src/openjdk/java/java/io/OutputStreamWriter.java
classlib6/core/src/openjdk/java/java/io/PipedReader.java
classlib6/core/src/openjdk/java/java/io/PipedWriter.java
classlib6/core/src/openjdk/java/java/io/PrintStream.java
classlib6/core/src/openjdk/java/java/io/PrintWriter.java
classlib6/core/src/openjdk/java/java/io/PushbackInputStream.java
classlib6/core/src/openjdk/java/java/io/PushbackReader.java
classlib6/core/src/openjdk/java/java/io/Reader.java
classlib6/core/src/openjdk/java/java/io/SequenceInputStream.java
classlib6/core/src/openjdk/java/java/io/Serializable.java
classlib6/core/src/openjdk/java/java/io/SerializablePermission.java
classlib6/core/src/openjdk/java/java/io/StreamCorruptedException.java
classlib6/core/src/openjdk/java/java/io/StreamTokenizer.java
classlib6/core/src/openjdk/java/java/io/StringBufferInputStream.java
classlib6/core/src/openjdk/java/java/io/StringReader.java
classlib6/core/src/openjdk/java/java/io/StringWriter.java
classlib6/core/src/openjdk/java/java/io/SyncFailedException.java
classlib6/core/src/openjdk/java/java/io/UTFDataFormatException.java
classlib6/core/src/openjdk/java/java/io/UnsupportedEncodingException.java
classlib6/core/src/openjdk/java/java/io/WriteAbortedException.java
classlib6/core/src/openjdk/java/java/io/Writer.java
classlib6/core/src/openjdk/java/java/io/package.html
Added Paths:
-----------
classlib6/core/src/openjdk/java/java/io/SerialCallbackContext.java
Modified: classlib6/core/src/openjdk/java/java/io/Bits.java
===================================================================
--- classlib6/core/src/openjdk/java/java/io/Bits.java 2011-03-06 18:55:51 UTC (rev 5805)
+++ classlib6/core/src/openjdk/java/java/io/Bits.java 2011-03-06 19:17:58 UTC (rev 5806)
@@ -1,12 +1,12 @@
/*
- * Copyright 2001-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 2001, 2005, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
package java.io;
Modified: classlib6/core/src/openjdk/java/java/io/BufferedInputStream.java
===================================================================
--- classlib6/core/src/openjdk/java/java/io/BufferedInputStream.java 2011-03-06 18:55:51 UTC (rev 5805)
+++ classlib6/core/src/openjdk/java/java/io/BufferedInputStream.java 2011-03-06 19:17:58 UTC (rev 5806)
@@ -1,12 +1,12 @@
/*
- * Copyright 1994-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 1994, 2006, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,13 +18,12 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
package java.io;
-import java.security.PrivilegedAction;
import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
/**
@@ -66,24 +65,11 @@
* of buf[] as primary indicator that this stream is closed. (The
* "in" field is also nulled out on close.)
*/
- private static final AtomicReferenceFieldUpdater<BufferedInputStream, byte[]> bufUpdater;
+ private static final
+ AtomicReferenceFieldUpdater<BufferedInputStream, byte[]> bufUpdater =
+ AtomicReferenceFieldUpdater.newUpdater
+ (BufferedInputStream.class, byte[].class, "buf");
- //jnode
- //todo: should be cleaned up (possible reason: bug in jnode security subsystem)
- static {
- bufUpdater = java.security.AccessController.doPrivileged(
- new PrivilegedAction<AtomicReferenceFieldUpdater<BufferedInputStream, byte[]>>() {
- @Override
- public AtomicReferenceFieldUpdater<BufferedInputStream, byte[]> run() {
- return createUpdater();
- }
- });
- }
-
- private static final AtomicReferenceFieldUpdater<BufferedInputStream, byte[]> createUpdater() {
- return AtomicReferenceFieldUpdater.newUpdater(BufferedInputStream.class, byte[].class, "buf");
- }
-
/**
* The index one greater than the index of the last valid byte in
* the buffer.
Modified: classlib6/core/src/openjdk/java/java/io/BufferedOutputStream.java
===================================================================
--- classlib6/core/src/openjdk/java/java/io/BufferedOutputStream.java 2011-03-06 18:55:51 UTC (rev 5805)
+++ classlib6/core/src/openjdk/java/java/io/BufferedOutputStream.java 2011-03-06 19:17:58 UTC (rev 5806)
@@ -1,12 +1,12 @@
/*
- * Copyright 1994-2003 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 1994, 2003, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
package java.io;
Modified: classlib6/core/src/openjdk/java/java/io/BufferedReader.java
===================================================================
--- classlib6/core/src/openjdk/java/java/io/BufferedReader.java 2011-03-06 18:55:51 UTC (rev 5805)
+++ classlib6/core/src/openjdk/java/java/io/BufferedReader.java 2011-03-06 19:17:58 UTC (rev 5806)
@@ -1,12 +1,12 @@
/*
- * Copyright 1996-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 1996, 2006, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
package java.io;
Modified: classlib6/core/src/openjdk/java/java/io/BufferedWriter.java
===================================================================
--- classlib6/core/src/openjdk/java/java/io/BufferedWriter.java 2011-03-06 18:55:51 UTC (rev 5805)
+++ classlib6/core/src/openjdk/java/java/io/BufferedWriter.java 2011-03-06 19:17:58 UTC (rev 5806)
@@ -1,12 +1,12 @@
/*
- * Copyright 1996-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
package java.io;
Modified: classlib6/core/src/openjdk/java/java/io/ByteArrayInputStream.java
===================================================================
--- classlib6/core/src/openjdk/java/java/io/ByteArrayInputStream.java 2011-03-06 18:55:51 UTC (rev 5805)
+++ classlib6/core/src/openjdk/java/java/io/ByteArrayInputStream.java 2011-03-06 19:17:58 UTC (rev 5806)
@@ -1,12 +1,12 @@
/*
- * Copyright 1994-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 1994, 2005, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
package java.io;
Modified: classlib6/core/src/openjdk/java/java/io/ByteArrayOutputStream.java
===================================================================
--- classlib6/core/src/openjdk/java/java/io/ByteArrayOutputStream.java 2011-03-06 18:55:51 UTC (rev 5805)
+++ classlib6/core/src/openjdk/java/java/io/ByteArrayOutputStream.java 2011-03-06 19:17:58 UTC (rev 5806)
@@ -1,12 +1,12 @@
/*
- * Copyright 1994-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 1994, 2006, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
package java.io;
Modified: classlib6/core/src/openjdk/java/java/io/CharArrayReader.java
===================================================================
--- classlib6/core/src/openjdk/java/java/io/CharArrayReader.java 2011-03-06 18:55:51 UTC (rev 5805)
+++ classlib6/core/src/openjdk/java/java/io/CharArrayReader.java 2011-03-06 19:17:58 UTC (rev 5806)
@@ -1,12 +1,12 @@
/*
- * Copyright 1996-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
package java.io;
Modified: classlib6/core/src/openjdk/java/java/io/CharArrayWriter.java
===================================================================
--- classlib6/core/src/openjdk/java/java/io/CharArrayWriter.java 2011-03-06 18:55:51 UTC (rev 5805)
+++ classlib6/core/src/openjdk/java/java/io/CharArrayWriter.java 2011-03-06 19:17:58 UTC (rev 5806)
@@ -1,12 +1,12 @@
/*
- * Copyright 1996-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
package java.io;
Modified: classlib6/core/src/openjdk/java/java/io/CharConversionException.java
===================================================================
--- classlib6/core/src/openjdk/java/java/io/CharConversionException.java 2011-03-06 18:55:51 UTC (rev 5805)
+++ classlib6/core/src/openjdk/java/java/io/CharConversionException.java 2011-03-06 19:17:58 UTC (rev 5806)
@@ -1,12 +1,12 @@
/*
- * Copyright 1996-1999 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 1996, 1999, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
package java.io;
Modified: classlib6/core/src/openjdk/java/java/io/Closeable.java
===================================================================
--- classlib6/core/src/openjdk/java/java/io/Closeable.java 2011-03-06 18:55:51 UTC (rev 5805)
+++ classlib6/core/src/openjdk/java/java/io/Closeable.java 2011-03-06 19:17:58 UTC (rev 5806)
@@ -1,12 +1,12 @@
/*
- * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
package java.io;
Modified: classlib6/core/src/openjdk/java/java/io/DataInputStream.java
===================================================================
--- classlib6/core/src/openjdk/java/java/io/DataInputStream.java 2011-03-06 18:55:51 UTC (rev 5805)
+++ classlib6/core/src/openjdk/java/java/io/DataInputStream.java 2011-03-06 19:17:58 UTC (rev 5806)
@@ -1,12 +1,12 @@
/*
- * Copyright 1994-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 1994, 2006, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
package java.io;
Modified: classlib6/core/src/openjdk/java/java/io/DataOutputStream.java
===================================================================
--- classlib6/core/src/openjdk/java/java/io/DataOutputStream.java 2011-03-06 18:55:51 UTC (rev 5805)
+++ classlib6/core/src/openjdk/java/java/io/DataOutputStream.java 2011-03-06 19:17:58 UTC (rev 5806)
@@ -1,12 +1,12 @@
/*
- * Copyright 1994-2004 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 1994, 2004, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
package java.io;
Modified: classlib6/core/src/openjdk/java/java/io/DeleteOnExitHook.java
===================================================================
--- classlib6/core/src/openjdk/java/java/io/DeleteOnExitHook.java 2011-03-06 18:55:51 UTC (rev 5805)
+++ classlib6/core/src/openjdk/java/java/io/DeleteOnExitHook.java 2011-03-06 19:17:58 UTC (rev 5806)
@@ -1,12 +1,12 @@
/*
- * Copyright 2005-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
package java.io;
Modified: classlib6/core/src/openjdk/java/java/io/EOFException.java
===================================================================
--- classlib6/core/src/openjdk/java/java/io/EOFException.java 2011-03-06 18:55:51 UTC (rev 5805)
+++ classlib6/core/src/openjdk/java/java/io/EOFException.java 2011-03-06 19:17:58 UTC (rev 5806)
@@ -1,12 +1,12 @@
/*
- * Copyright 1995-2000 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 1995, 2000, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
package java.io;
Modified: classlib6/core/src/openjdk/java/java/io/ExpiringCache.java
===================================================================
--- classlib6/core/src/openjdk/java/java/io/ExpiringCache.java 2011-03-06 18:55:51 UTC (rev 5805)
+++ classlib6/core/src/openjdk/java/java/io/ExpiringCache.java 2011-03-06 19:17:58 UTC (rev 5806)
@@ -1,12 +1,12 @@
/*
- * Copyright 2002-2004 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 2002, 2004, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
Modified: classlib6/core/src/openjdk/java/java/io/Externalizable.java
===================================================================
--- classlib6/core/src/openjdk/java/java/io/Externalizable.java 2011-03-06 18:55:51 UTC (rev 5805)
+++ classlib6/core/src/openjdk/java/java/io/Externalizable.java 2011-03-06 19:17:58 UTC (rev 5806)
@@ -1,12 +1,12 @@
/*
- * Copyright 1996-2004 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 1996, 2004, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
package java.io;
Modified: classlib6/core/src/openjdk/java/java/io/File.java
===================================================================
--- classlib6/core/src/openjdk/java/java/io/File.java 2011-03-06 18:55:51 UTC (rev 5805)
+++ classlib6/core/src/openjdk/java/java/io/File.java 2011-03-06 19:17:58 UTC (rev 5806)
@@ -1,12 +1,12 @@
/*
- * Copyright 1994-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 1994, 2007, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
package java.io;
@@ -32,9 +32,9 @@
import java.util.ArrayList;
import java.util.Map;
import java.util.Hashtable;
-import java.util.Random;
import java.security.AccessController;
import java.security.AccessControlException;
+import java.security.SecureRandom;
import sun.security.action.GetPropertyAction;
@@ -1676,28 +1676,28 @@
/* -- Temporary files -- */
- private static final Object tmpFileLock = new Object();
+ // lazy initialization of SecureRandom and temporary file directory
+ private static class LazyInitialization {
+ static final SecureRandom random = new SecureRandom();
- private static int counter = -1; /* Protected by tmpFileLock */
+ static final String temporaryDirectory = temporaryDirectory();
+ static String temporaryDirectory() {
+ return fs.normalize(
+ AccessController.doPrivileged(
+ new GetPropertyAction("java.io.tmpdir")));
+ }
+ }
private static File generateFile(String prefix, String suffix, File dir)
throws IOException
{
- if (counter == -1) {
- counter = new Random().nextInt() & 0xffff;
- }
- counter++;
- return new File(dir, prefix + Integer.toString(counter) + suffix);
+ long n = LazyInitialization.random.nextLong();
+ if (n == Long.MIN_VALUE) {
+ n = 0; // corner case
+ } else {
+ n = Math.abs(n);
}
-
- private static String tmpdir; /* Protected by tmpFileLock */
-
- private static String getTempDir() {
- if (tmpdir == null)
- tmpdir = fs.normalize(
- AccessController.doPrivileged(
- new GetPropertyAction("java.io.tmpdir")));
- return tmpdir;
+ return new File(dir, prefix + Long.toString(n) + suffix);
}
private static boolean checkAndCreate(String filename, SecurityManager sm)
@@ -1793,9 +1793,8 @@
if (prefix.length() < 3)
throw new IllegalArgumentException("Prefix string too short");
String s = (suffix == null) ? ".tmp" : suffix;
- synchronized (tmpFileLock) {
if (directory == null) {
- String tmpDir = getTempDir();
+ String tmpDir = LazyInitialization.temporaryDirectory();
directory = new File(tmpDir, fs.prefixLength(tmpDir));
}
SecurityManager sm = System.getSecurityManager();
@@ -1805,7 +1804,6 @@
} while (!checkAndCreate(f.getPath(), sm));
return f;
}
- }
/**
* Creates an empty file in the default temporary-file directory, using
@@ -1938,11 +1936,12 @@
private synchronized void readObject(java.io.ObjectInputStream s)
throws IOException, ClassNotFoundException
{
- s.defaultReadObject();
+ ObjectInputStream.GetField fields = s.readFields();
+ String pathField = (String)fields.get("path", null);
char sep = s.readChar(); // read the previous separator char
if (sep != separatorChar)
- this.path = this.path.replace(sep, separatorChar);
- this.path = fs.normalize(this.path);
+ pathField = pathField.replace(sep, separatorChar);
+ this.path = fs.normalize(pathField);
this.prefixLength = fs.prefixLength(this.path);
}
Modified: classlib6/core/src/openjdk/java/java/io/FileFilter.java
===================================================================
--- classlib6/core/src/openjdk/java/java/io/FileFilter.java 2011-03-06 18:55:51 UTC (rev 5805)
+++ classlib6/core/src/openjdk/java/java/io/FileFilter.java 2011-03-06 19:17:58 UTC (rev 5806)
@@ -1,12 +1,12 @@
/*
- * Copyright 1998-2002 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 1998, 2002, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
package java.io;
Modified: classlib6/core/src/openjdk/java/java/io/FileNotFoundException.java
===================================================================
--- classlib6/core/src/openjdk/java/java/io/FileNotFoundException.java 2011-03-06 18:55:51 UTC (rev 5805)
+++ classlib6/core/src/openjdk/java/java/io/FileNotFoundException.java 2011-03-06 19:17:58 UTC (rev 5806)
@@ -1,12 +1,12 @@
/*
- * Copyright 1994-1999 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 1994, 1999, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
package java.io;
Modified: classlib6/core/src/openjdk/java/java/io/FileReader.java
===================================================================
--- classlib6/core/src/openjdk/java/java/io/FileReader.java 2011-03-06 18:55:51 UTC (rev 5805)
+++ classlib6/core/src/openjdk/java/java/io/FileReader.java 2011-03-06 19:17:58 UTC (rev 5806)
@@ -1,12 +1,12 @@
/*
- * Copyright 1996-2001 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 1996, 2001, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
package java.io;
Modified: classlib6/core/src/openjdk/java/java/io/FileSystem.java
===================================================================
--- classlib6/core/src/openjdk/java/java/io/FileSystem.java 2011-03-06 18:55:51 UTC (rev 5805)
+++ classlib6/core/src/openjdk/java/java/io/FileSystem.java 2011-03-06 19:17:58 UTC (rev 5806)
@@ -1,12 +1,12 @@
/*
- * Copyright 1998-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
package java.io;
Modified: classlib6/core/src/openjdk/java/java/io/FileWriter.java
===================================================================
--- classlib6/core/src/openjdk/java/java/io/FileWriter.java 2011-03-06 18:55:51 UTC (rev 5805)
+++ classlib6/core/src/openjdk/java/java/io/FileWriter.java 2011-03-06 19:17:58 UTC (rev 5806)
@@ -1,12 +1,12 @@
/*
- * Copyright 1996-2001 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 1996, 2001, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
package java.io;
Modified: classlib6/core/src/openjdk/java/java/io/FilenameFilter.java
===================================================================
--- classlib6/core/src/openjdk/java/java/io/FilenameFilter.java 2011-03-06 18:55:51 UTC (rev 5805)
+++ classlib6/core/src/openjdk/java/java/io/FilenameFilter.java 2011-03-06 19:17:58 UTC (rev 5806)
@@ -1,12 +1,12 @@
/*
- * Copyright 1994-1998 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 1994, 1998, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
package java.io;
Modified: classlib6/core/src/openjdk/java/java/io/FilterInputStream.java
===================================================================
--- classlib6/core/src/openjdk/java/java/io/FilterInputStream.java 2011-03-06 18:55:51 UTC (rev 5805)
+++ classlib6/core/src/openjdk/java/java/io/FilterInputStream.java 2011-03-06 19:17:58 UTC (rev 5806)
@@ -1,12 +1,12 @@
/*
- * Copyright 1994-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 1994, 2006, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
package java.io;
Modified: classlib6/core/src/openjdk/java/java/io/FilterOutputStream.java
===================================================================
--- classlib6/core/src/openjdk/java/java/io/FilterOutputStream.java 2011-03-06 18:55:51 UTC (rev 5805)
+++ classlib6/core/src/openjdk/java/java/io/FilterOutputStream.java 2011-03-06 19:17:58 UTC (rev 5806)
@@ -1,12 +1,12 @@
/*
- * Copyright 1994-1999 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 1994, 1999, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
package java.io;
Modified: classlib6/core/src/openjdk/java/java/io/FilterReader.java
===================================================================
--- classlib6/core/src/openjdk/java/java/io/FilterReader.java 2011-03-06 18:55:51 UTC (rev 5805)
+++ classlib6/core/src/openjdk/java/java/io/FilterReader.java 2011-03-06 19:17:58 UTC (rev 5806)
@@ -1,12 +1,12 @@
/*
- * Copyright 1996-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
package java.io;
Modified: classlib6/core/src/openjdk/java/java/io/FilterWriter.java
===================================================================
--- classlib6/core/src/openjdk/java/java/io/FilterWriter.java 2011-03-06 18:55:51 UTC (rev 5805)
+++ classlib6/core/src/openjdk/java/java/io/FilterWriter.java 2011-03-06 19:17:58 UTC (rev 5806)
@@ -1,12 +1,12 @@
/*
- * Copyright 1996-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
package java.io;
Modified: classlib6/core/src/openjdk/java/java/io/Flushable.java
===================================================================
--- classlib6/core/src/openjdk/java/java/io/Flushable.java 2011-03-06 18:55:51 UTC (rev 5805)
+++ classlib6/core/src/openjdk/java/java/io/Flushable.java 2011-03-06 19:17:58 UTC (rev 5806)
@@ -1,12 +1,12 @@
/*
- * Copyright 2004 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
package java.io;
Modified: classlib6/core/src/openjdk/java/java/io/IOException.java
===================================================================
--- classlib6/core/src/openjdk/java/java/io/IOException.java 2011-03-06 18:55:51 UTC (rev 5805)
+++ classlib6/core/src/openjdk/java/java/io/IOException.java 2011-03-06 19:17:58 UTC (rev 5806)
@@ -1,12 +1,12 @@
/*
- * Copyright 1994-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 1994, 2006, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*...
[truncated message content] |
