This is the mail archive of the java-patches@gcc.gnu.org mailing list for the Java project.

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]
Other format:	[Raw text]

FYI: Patches: classpath merging

From: Michael Koch <konqueror at gmx dot de>
To: java-patches at gcc dot gnu dot org
Date: Sat, 14 Jun 2003 07:47:12 +0200
Subject: FYI: Patches: classpath merging

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi list,


I commited the attached patched to trunk to merge classpath fixes.


Michael
- -- 
Homepage: http://www.worldforge.org/
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (GNU/Linux)

iD8DBQE+6rbmWSOgCCdjSDsRAsB8AJ4jv1lVlVaXl+hyfpWZvvq452nSogCghfuR
EWZLTyM0c/AR3jSCrcBoKBQ=
=Lpqc
-----END PGP SIGNATURE-----

Index: ChangeLog
===================================================================
RCS file: /cvs/gcc/gcc/libjava/ChangeLog,v
retrieving revision 1.1941
diff -u -b -B -r1.1941 ChangeLog
--- ChangeLog	12 Jun 2003 03:13:13 -0000	1.1941
+++ ChangeLog	14 Jun 2003 05:38:34 -0000
@@ -1,3 +1,9 @@
+2003-06-14  Michael Koch  <konqueror@gmx.de>
+
+	* java/io/BufferedReader.java,
+	java/io/FileOutputStream.java:
+	New versions from classpath.
+
 2003-06-11  Tom Tromey  <tromey@redhat.com>
 
 	* java/lang/ClassLoader.java (loadClass): Not deprecated.
Index: java/io/BufferedReader.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/io/BufferedReader.java,v
retrieving revision 1.13
diff -u -b -B -r1.13 BufferedReader.java
--- java/io/BufferedReader.java	20 Apr 2003 22:47:43 -0000	1.13
+++ java/io/BufferedReader.java	14 Jun 2003 05:38:35 -0000
@@ -164,6 +164,9 @@
    */
   public void mark(int readLimit) throws IOException
   {
+    if (readLimit < 0)
+      throw new IllegalArgumentException();
+
     synchronized (lock)
       {
 	checkStatus();
Index: java/io/FileOutputStream.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/io/FileOutputStream.java,v
retrieving revision 1.13
diff -u -b -B -r1.13 FileOutputStream.java
--- java/io/FileOutputStream.java	6 May 2003 10:07:28 -0000	1.13
+++ java/io/FileOutputStream.java	14 Jun 2003 05:38:35 -0000
@@ -85,7 +85,8 @@
     if (s != null)
       s.checkWrite(path);
     fd = new FileDescriptor (path, (append
-				    ? FileDescriptor.APPEND
+				    ? FileDescriptor.WRITE
+				      | FileDescriptor.APPEND
 				    : FileDescriptor.WRITE));
   }

Index: ChangeLog
===================================================================
RCS file: /cvs/gcc/gcc/libjava/ChangeLog,v
retrieving revision 1.1941
diff -u -b -B -r1.1941 ChangeLog
--- ChangeLog	12 Jun 2003 03:13:13 -0000	1.1941
+++ ChangeLog	14 Jun 2003 05:38:56 -0000
@@ -1,3 +1,8 @@
+2003-06-14  Michael Koch  <konqueror@gmx.de>
+
+	* javax/naming/directory/Attribute.java:
+	New version from classpath.
+
 2003-06-11  Tom Tromey  <tromey@redhat.com>
 
 	* java/lang/ClassLoader.java (loadClass): Not deprecated.
Index: javax/naming/directory/Attribute.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/naming/directory/Attribute.java,v
retrieving revision 1.3
diff -u -b -B -r1.3 Attribute.java
--- javax/naming/directory/Attribute.java	23 Nov 2002 21:50:40 -0000	1.3
+++ javax/naming/directory/Attribute.java	14 Jun 2003 05:38:56 -0000
@@ -45,11 +45,9 @@
  * @author Warren Levy <warrenl@redhat.com>
  * @date June 14, 2001
  */
-
 public interface Attribute extends Cloneable, Serializable
 {
-  // FIXME: Need to set value from JNDI 1.1.1 fro interoperability.
-  // public static final long serialVersionUID = ;
+  public static final long serialVersionUID = 8707690322213556804L;
 
   public NamingEnumeration getAll() throws NamingException;
   public Object get() throws NamingException;

Index: ChangeLog
===================================================================
RCS file: /cvs/gcc/gcc/libjava/ChangeLog,v
retrieving revision 1.1941
diff -u -b -B -r1.1941 ChangeLog
--- ChangeLog	12 Jun 2003 03:13:13 -0000	1.1941
+++ ChangeLog	14 Jun 2003 05:39:26 -0000
@@ -1,3 +1,8 @@
+2003-06-14  Michael Koch  <konqueror@gmx.de>
+
+	* java/security/BasicPermission.java:
+	New version from classpath.
+
 2003-06-11  Tom Tromey  <tromey@redhat.com>
 
 	* java/lang/ClassLoader.java (loadClass): Not deprecated.
Index: java/security/BasicPermission.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/security/BasicPermission.java,v
retrieving revision 1.5
diff -u -b -B -r1.5 BasicPermission.java
--- java/security/BasicPermission.java	24 May 2002 11:57:11 -0000	1.5
+++ java/security/BasicPermission.java	14 Jun 2003 05:39:26 -0000
@@ -1,5 +1,5 @@
 /* BasicPermission.java -- implements a simple named permission
-   Copyright (C) 1998, 1999, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2002, 2003 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -71,9 +71,8 @@
  * @since 1.1
  * @status updated to 1.4
  */
-public abstract class BasicPermission extends java.security.Permission
+public abstract class BasicPermission extends Permission
   implements Serializable
-  // FIXME extends with fully qualified classname is workaround for gcj 3.0.4.
 {
   /**
    * Compatible with JDK 1.1+.

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]