diff options
| author | doko <doko@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-12-19 17:03:15 +0000 |
|---|---|---|
| committer | doko <doko@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-12-19 17:03:15 +0000 |
| commit | 6fec1adc6432eeafcdea2ab165989e170cb6e64e (patch) | |
| tree | 9b478aacc6b13f1beadacec2ade096dcb732af53 /libjava/gnu/java/nio | |
| parent | abae7d71da9352babb77917224e837ffdfa118be (diff) | |
| download | ppe42-gcc-6fec1adc6432eeafcdea2ab165989e170cb6e64e.tar.gz ppe42-gcc-6fec1adc6432eeafcdea2ab165989e170cb6e64e.zip | |
2012-12-19 Matthias Klose <doko@ubuntu.com>
Import GNU Classpath (20121202).
* Regenerate class and header files.
* Regenerate auto* files.
* sources.am, gcj/javaprims.h: Regenerate.
* gnu/java/nio/FileLockImpl.java (close): New override.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@194618 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/gnu/java/nio')
| -rw-r--r-- | libjava/gnu/java/nio/FileLockImpl.h | 1 | ||||
| -rw-r--r-- | libjava/gnu/java/nio/FileLockImpl.java | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/libjava/gnu/java/nio/FileLockImpl.h b/libjava/gnu/java/nio/FileLockImpl.h index ba1668be327..514f03ea65d 100644 --- a/libjava/gnu/java/nio/FileLockImpl.h +++ b/libjava/gnu/java/nio/FileLockImpl.h @@ -34,6 +34,7 @@ public: // actually protected void finalize(); public: jboolean isValid(); + void close(); void release(); private: jboolean __attribute__((aligned(__alignof__( ::java::nio::channels::FileLock)))) valid; diff --git a/libjava/gnu/java/nio/FileLockImpl.java b/libjava/gnu/java/nio/FileLockImpl.java index 673ca2522df..6af01f15ebc 100644 --- a/libjava/gnu/java/nio/FileLockImpl.java +++ b/libjava/gnu/java/nio/FileLockImpl.java @@ -90,6 +90,11 @@ public final class FileLockImpl extends FileLock return valid; } + public void close() throws Exception + { + release(); + } + /** * Releases the lock if it is still valid. Marks this lock as invalid. */ |
