diff options
| author | bryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-04-12 23:22:14 +0000 |
|---|---|---|
| committer | bryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-04-12 23:22:14 +0000 |
| commit | 76b9f395193720e3fcae7f505ee0e15e55e9eddb (patch) | |
| tree | bead6b0e3281cff5fa7bb18898bbf660923b126b /libjava/gnu/gcj | |
| parent | 73654594dd36082f561260a339614b3a57f78f1d (diff) | |
| download | ppe42-gcc-76b9f395193720e3fcae7f505ee0e15e55e9eddb.tar.gz ppe42-gcc-76b9f395193720e3fcae7f505ee0e15e55e9eddb.zip | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@98053 138bc75d-0d04-0410-961f-82ee72b054a4
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 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()); |
