diff options
| author | Aaron Luchko <aluchko@redhat.com> | 2005-04-12 23:22:14 +0000 |
|---|---|---|
| committer | Bryce McKinlay <bryce@gcc.gnu.org> | 2005-04-13 00:22:14 +0100 |
| commit | ea1194ab2c4bde0b9b68f471084557a9b665871d (patch) | |
| tree | bead6b0e3281cff5fa7bb18898bbf660923b126b /libjava/gnu/gcj | |
| parent | c6abe94dc12e4f7e56b5439a081e0b11c6950d92 (diff) | |
| download | gcc-ea1194ab2c4bde0b9b68f471084557a9b665871d.zip gcc-ea1194ab2c4bde0b9b68f471084557a9b665871d.tar.gz gcc-ea1194ab2c4bde0b9b68f471084557a9b665871d.tar.bz2 | |
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
Diffstat (limited to 'libjava/gnu/gcj')
| -rw-r--r-- | libjava/gnu/gcj/runtime/PersistentByteMap.java | 2 | ||||
| -rw-r--r-- | libjava/gnu/gcj/tools/gcj_dbtool/Main.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libjava/gnu/gcj/runtime/PersistentByteMap.java b/libjava/gnu/gcj/runtime/PersistentByteMap.java index a20f5b8..a2b91da 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 58e9720..f16a86a 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()); |