diff options
| author | Michael Koch <konqueror@gmx.de> | 2003-05-18 06:36:35 +0000 |
|---|---|---|
| committer | Michael Koch <konqueror@gmx.de> | 2003-05-18 06:36:35 +0000 |
| commit | 047dd338364c4e20a889a294e8f31b93ff66d7fa (patch) | |
| tree | fcaa8e95eeaaedda034265a63c37a3b2b4318197 /java | |
| parent | 579ccc2cd9fd8103ea0fd0629f4015adcfeec718 (diff) | |
| download | classpath-047dd338364c4e20a889a294e8f31b93ff66d7fa.tar.gz | |
2003-05-18 Michael Koch <konqueror@gmx.de>
* java/nio/channels/FileLock.java:
New version from libgcj.
* java/nio/charset/Charset.java:
Likewise.
Diffstat (limited to 'java')
| -rw-r--r-- | java/nio/channels/FileLock.java | 2 | ||||
| -rw-r--r-- | java/nio/charset/Charset.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/java/nio/channels/FileLock.java b/java/nio/channels/FileLock.java index 1b4595e5c..866ed3997 100644 --- a/java/nio/channels/FileLock.java +++ b/java/nio/channels/FileLock.java @@ -101,7 +101,7 @@ public abstract class FileLock */ public final boolean overlaps (long position, long size) { - if (position > this.position +this.size) + if (position > this.position + this.size) return false; if (position + size < this.position) diff --git a/java/nio/charset/Charset.java b/java/nio/charset/Charset.java index 889267f30..e0f27e6e6 100644 --- a/java/nio/charset/Charset.java +++ b/java/nio/charset/Charset.java @@ -235,7 +235,7 @@ public abstract class Charset implements Comparable return encode (CharBuffer.wrap (str)); } - public CharBuffer decode (ByteBuffer bb) + public final CharBuffer decode (ByteBuffer bb) { try { |