Merge branch 'stable'

Author: michaelklishin

src/com/rabbitmq/client/Channel.java

@@ -16,7 +16,6 @@
 
 package com.rabbitmq.client;
 
-import java.io.Closeable;
 import java.io.IOException;
 import java.util.Map;
 import java.util.concurrent.TimeoutException;
@@ -59,7 +58,7 @@
  *
  */
 
-public interface Channel extends ShutdownNotifier, Closeable {
+public interface Channel extends ShutdownNotifier {
     /**
      * Retrieve this channel's channel number.
      * @return the channel number
@@ -78,7 +77,6 @@ public interface Channel extends ShutdownNotifier, Closeable {
      *
      * @throws java.io.IOException if an error is encountered
      */
-    @Override
     void close() throws IOException, TimeoutException;
 
     /**

src/com/rabbitmq/client/Connection.java

@@ -16,7 +16,6 @@
 
 package com.rabbitmq.client;
 
-import java.io.Closeable;
 import java.io.IOException;
 import java.net.InetAddress;
 import java.util.Map;
@@ -51,7 +50,7 @@
  * Current implementations are thread-safe for code at the client API level,
  * and in fact thread-safe internally except for code within RPC calls.
  */
-public interface Connection extends ShutdownNotifier, Closeable { // rename to AMQPConnection later, this is a temporary name
+public interface Connection extends ShutdownNotifier { // rename to AMQPConnection later, this is a temporary name
     /**
      * Retrieve the host.
      * @return the hostname of the peer we're connected to.
@@ -124,7 +123,6 @@ public interface Connection extends ShutdownNotifier, Closeable { // rename to A
      *
      * @throws IOException if an I/O problem is encountered
      */
-    @Override
     void close() throws IOException;
 
     /**

src/com/rabbitmq/client/RpcClient.java

@@ -19,7 +19,6 @@
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
-import java.io.Closeable;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.EOFException;
@@ -42,7 +41,7 @@
  * It simply provides a mechanism for sending a message to an exchange with a given routing key,
  * and waiting for a response.
 */
-public class RpcClient extends Closeable {
+public class RpcClient {
     /** Channel we are communicating on */
     private final Channel _channel;
     /** Exchange to send requests to */
@@ -114,7 +113,6 @@ public void checkConsumer() throws IOException {
      * Public API - cancels the consumer, thus deleting the temporary queue, and marks the RpcClient as closed.
      * @throws IOException if an error is encountered
      */
-    @Override
     public void close() throws IOException {
         if (_consumer != null) {
             _channel.basicCancel(_consumer.getConsumerTag());

src/com/rabbitmq/client/RpcServer.java

@@ -17,14 +17,13 @@
 
 package com.rabbitmq.client;
 
-import java.io.Closeable;
 import java.io.IOException;
 
 /**
  * Class which manages a request queue for a simple RPC-style service.
  * The class is agnostic about the format of RPC arguments / return values.
 */
-public class RpcServer extends Closeable {
+public class RpcServer {
     /** Channel we are communicating on */
     private final Channel _channel;
     /** Queue to receive requests from */
@@ -67,7 +66,6 @@ public RpcServer(Channel channel, String queueName)
      * it was a temporary queue, and marks the RpcServer as closed.
      * @throws IOException if an error is encountered
      */
-    @Override
     public void close()
         throws IOException
     {