--- a/jdk/src/share/classes/java/beans/XMLDecoder.java	Thu Jul 01 15:30:44 2010 -0400
+++ b/jdk/src/share/classes/java/beans/XMLDecoder.java	Tue Jul 06 18:58:30 2010 -0700
@@ -60,7 +60,7 @@
  *
  * @author Philip Milne
  */
-public class XMLDecoder {
+public class XMLDecoder implements AutoCloseable {
     private final DocumentHandler handler = new DocumentHandler();
     private final InputSource input;
     private Object owner;

--- a/jdk/src/share/classes/java/beans/XMLEncoder.java	Thu Jul 01 15:30:44 2010 -0400
+++ b/jdk/src/share/classes/java/beans/XMLEncoder.java	Tue Jul 06 18:58:30 2010 -0700
@@ -204,7 +204,7 @@
  *
  * @author Philip Milne
  */
-public class XMLEncoder extends Encoder {
+public class XMLEncoder extends Encoder implements AutoCloseable {
 
     private final CharsetEncoder encoder;
     private final String charset;

--- a/jdk/src/share/classes/java/io/ObjectInput.java	Thu Jul 01 15:30:44 2010 -0400
+++ b/jdk/src/share/classes/java/io/ObjectInput.java	Tue Jul 06 18:58:30 2010 -0700
@@ -36,7 +36,7 @@
  * @see java.io.ObjectInputStream
  * @since   JDK1.1
  */
-public interface ObjectInput extends DataInput {
+public interface ObjectInput extends DataInput, AutoCloseable {
     /**
      * Read and return an object. The class that implements this interface
      * defines where the object is "read" from.

--- a/jdk/src/share/classes/java/io/ObjectOutput.java	Thu Jul 01 15:30:44 2010 -0400
+++ b/jdk/src/share/classes/java/io/ObjectOutput.java	Tue Jul 06 18:58:30 2010 -0700
@@ -36,7 +36,7 @@
  * @see java.io.ObjectInputStream
  * @since   JDK1.1
  */
-public interface ObjectOutput extends DataOutput {
+public interface ObjectOutput extends DataOutput, AutoCloseable {
     /**
      * Write an object to the underlying storage or stream.  The
      * class that implements this interface defines how the object is

--- a/jdk/src/share/classes/java/util/Scanner.java	Thu Jul 01 15:30:44 2010 -0400
+++ b/jdk/src/share/classes/java/util/Scanner.java	Tue Jul 06 18:58:30 2010 -0700
@@ -343,7 +343,7 @@
  *
  * @since   1.5
  */
-public final class Scanner implements Iterator<String> {
+public final class Scanner implements Iterator<String>, Closeable {
 
     // Internal buffer used to hold input
     private CharBuffer buf;

--- a/jdk/src/share/classes/javax/sound/midi/MidiDevice.java	Thu Jul 01 15:30:44 2010 -0400
+++ b/jdk/src/share/classes/javax/sound/midi/MidiDevice.java	Tue Jul 06 18:58:30 2010 -0700
@@ -107,7 +107,7 @@
  * @author Florian Bomers
  */
 
-public interface MidiDevice {
+public interface MidiDevice extends AutoCloseable {
 
 
     /**

--- a/jdk/src/share/classes/javax/sound/midi/Receiver.java	Thu Jul 01 15:30:44 2010 -0400
+++ b/jdk/src/share/classes/javax/sound/midi/Receiver.java	Tue Jul 06 18:58:30 2010 -0700
@@ -38,7 +38,7 @@
  *
  * @author Kara Kytle
  */
-public interface Receiver {
+public interface Receiver extends AutoCloseable {
 
 
     //$$fb 2002-04-12: fix for 4662090: Contradiction in Receiver specification

--- a/jdk/src/share/classes/javax/sound/midi/Transmitter.java	Thu Jul 01 15:30:44 2010 -0400
+++ b/jdk/src/share/classes/javax/sound/midi/Transmitter.java	Tue Jul 06 18:58:30 2010 -0700
@@ -35,7 +35,7 @@
  *
  * @author Kara Kytle
  */
-public interface Transmitter {
+public interface Transmitter extends AutoCloseable {
 
 
     /**

--- a/jdk/src/share/classes/javax/sound/sampled/Line.java	Thu Jul 01 15:30:44 2010 -0400
+++ b/jdk/src/share/classes/javax/sound/sampled/Line.java	Tue Jul 06 18:58:30 2010 -0700
@@ -70,7 +70,7 @@
  * @see LineEvent
  * @since 1.3
  */
-public interface Line {
+public interface Line extends AutoCloseable {
 
     /**
      * Obtains the <code>Line.Info</code> object describing this