re PR libgcj/20958 (Compile Errors In two files in gnu.gcj)

2005-04-12  Aaron Luchko  <aluchko@redhat.com>

	PR libgcj/20958
	* gnu/gcj/runtime/PersistentByteMap.java (close): Throw IOException.
	* gnu/gcj/tools/gcj_dbtool/Main.java (addJar): Make 'length' an int.

From-SVN: r98053

libjava/ChangeLog

 2005-04-12  Aaron Luchko  <aluchko@redhat.com>
 
+	PR libgcj/20958
+	* gnu/gcj/runtime/PersistentByteMap.java (close): Throw IOException.
+	* gnu/gcj/tools/gcj_dbtool/Main.java (addJar): Make 'length' an int.
+
+2005-04-12  Aaron Luchko  <aluchko@redhat.com>
+
 	PR libgcj/20975
 	* scripts/TexinfoDoclet.java: Removed.
 	* Makefile.am (texinfo): Removed.

libjava/gnu/gcj/runtime/PersistentByteMap.java

@@ -452,7 +452,7 @@ public class PersistentByteMap
 
   // Close the map.  Once this has been done, the map can no longer be
   // used.
-  public void close()
+  public void close() throws IOException
   {
     force();
     fc.close();

libjava/gnu/gcj/tools/gcj_dbtool/Main.java

@@ -375,7 +375,7 @@ public class Main
 	if (classfile.getName().endsWith(".class"))
 	  {
 	    InputStream str = jar.getInputStream(classfile);
-	    long length = classfile.getSize();
+	    int length = (int) classfile.getSize();
 	    if (length == -1)
 	      throw new EOFException();
 
@@ -383,7 +383,7 @@ public class Main
 	    int pos = 0;
 	    while (length - pos > 0)
 	      {
-		int len = str.read(data, pos, (int)(length - pos));
+		int len = str.read(data, pos, length - pos);
 		if (len == -1)
 		  throw new EOFException("Not enough data reading from: "
 					 + classfile.getName());