From ea1194ab2c4bde0b9b68f471084557a9b665871d Mon Sep 17 00:00:00 2001 From: Aaron Luchko Date: Tue, 12 Apr 2005 23:22:14 +0000 Subject: [PATCH] re PR libgcj/20958 (Compile Errors In two files in gnu.gcj) 2005-04-12 Aaron Luchko 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 | 6 ++++++ libjava/gnu/gcj/runtime/PersistentByteMap.java | 2 +- libjava/gnu/gcj/tools/gcj_dbtool/Main.java | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 03aa02c7105..0ae3d5ec5b8 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2005-04-12 Aaron Luchko + + 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 PR libgcj/20975 diff --git a/libjava/gnu/gcj/runtime/PersistentByteMap.java b/libjava/gnu/gcj/runtime/PersistentByteMap.java index a20f5b8ab2b..a2b91da84fa 100644 --- a/libjava/gnu/gcj/runtime/PersistentByteMap.java +++ b/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(); diff --git a/libjava/gnu/gcj/tools/gcj_dbtool/Main.java b/libjava/gnu/gcj/tools/gcj_dbtool/Main.java index 58e9720f5fb..f16a86a3698 100644 --- a/libjava/gnu/gcj/tools/gcj_dbtool/Main.java +++ b/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()); -- 2.30.2