From a1906e8bbfa426ed1adfe751608bc74f1d4d2ab7 Mon Sep 17 00:00:00 2001
From: Matthias Klose <doko@gcc.gnu.org>
Date: Wed, 19 Dec 2012 17:03:15 +0000
Subject: Import GNU Classpath (20121202).

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.

From-SVN: r194618
---
 libjava/classpath/java/io/Closeable.java         | 1 +
 libjava/classpath/java/io/ObjectInput.java       | 3 ++-
 libjava/classpath/java/io/ObjectInputStream.java | 3 ++-
 libjava/classpath/java/io/ObjectOutput.java      | 3 ++-
 4 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'libjava/classpath/java/io')

diff --git a/libjava/classpath/java/io/Closeable.java b/libjava/classpath/java/io/Closeable.java
index b8523d7..f5f8083 100644
--- a/libjava/classpath/java/io/Closeable.java
+++ b/libjava/classpath/java/io/Closeable.java
@@ -48,6 +48,7 @@ package java.io;
  * @since 1.5
  */
 public interface Closeable
+  extends AutoCloseable
 {
 
   /**
diff --git a/libjava/classpath/java/io/ObjectInput.java b/libjava/classpath/java/io/ObjectInput.java
index f8d51e0..071f67d 100644
--- a/libjava/classpath/java/io/ObjectInput.java
+++ b/libjava/classpath/java/io/ObjectInput.java
@@ -48,7 +48,8 @@ package java.io;
   *
   * @see DataInput
   */
-public interface ObjectInput extends DataInput
+public interface ObjectInput
+  extends DataInput, AutoCloseable
 {
   /**
     * This method returns the number of bytes that can be read without
diff --git a/libjava/classpath/java/io/ObjectInputStream.java b/libjava/classpath/java/io/ObjectInputStream.java
index c37f766..657072d 100644
--- a/libjava/classpath/java/io/ObjectInputStream.java
+++ b/libjava/classpath/java/io/ObjectInputStream.java
@@ -529,12 +529,13 @@ public class ObjectInputStream extends InputStream
            if (dump)
              dumpElementln("ENUM=");
            ObjectStreamClass osc = (ObjectStreamClass) readObject();
+	   int enumHandle = assignNewHandle(null, shared);
            String constantName = (String) readObject();
            if (dump)
              dumpElementln("CONSTANT NAME = " + constantName);
            Class clazz = osc.forClass();
            Enum instance = Enum.valueOf(clazz, constantName);
-           assignNewHandle(instance,shared);
+	   rememberHandle(instance, shared, enumHandle);
            ret_val = instance;
            break;
          }
diff --git a/libjava/classpath/java/io/ObjectOutput.java b/libjava/classpath/java/io/ObjectOutput.java
index 628f8b9..4ec6c6f 100644
--- a/libjava/classpath/java/io/ObjectOutput.java
+++ b/libjava/classpath/java/io/ObjectOutput.java
@@ -48,7 +48,8 @@ package java.io;
   *
   * @see DataOutput
   */
-public interface ObjectOutput extends DataOutput
+public interface ObjectOutput
+  extends DataOutput, AutoCloseable
 {
   /**
     * This method writes the specified byte to the output stream.
-- 
cgit v1.1