QPID-5551 : Remove redundant throws AMQException clauses

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1567971 13f79535-47bb-0310-9956-ffa450edef68

30 files changed, 85 insertions, 201 deletions

diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/consumer/Consumer.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/consumer/Consumer.java
index e082d6eee4..76eb7e8c14 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/consumer/Consumer.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/consumer/Consumer.java
@@ -77,5 +77,5 @@ public interface Consumer
 
     String getName();
 
-    void flush() throws AMQException;
+    void flush();
 }
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/consumer/ConsumerTarget.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/consumer/ConsumerTarget.java
index 92579475ed..a32fd7fc59 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/consumer/ConsumerTarget.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/consumer/ConsumerTarget.java
@@ -49,13 +49,13 @@ public interface ConsumerTarget
 
     AMQSessionModel getSessionModel();
 
-    void send(MessageInstance entry, boolean batch) throws AMQException;
+    void send(MessageInstance entry, boolean batch);
 
     void flushBatched();
 
     void queueDeleted();
 
-    void queueEmpty() throws AMQException;
+    void queueEmpty();
 
     boolean allocateCredit(ServerMessage msg);
 
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeRegistry.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeRegistry.java
index b54f995b5e..858aa224de 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeRegistry.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeRegistry.java
@@ -102,39 +102,37 @@ public class DefaultExchangeRegistry implements ExchangeRegistry
         return _defaultExchange;
     }
 
-    public void unregisterExchange(String name, boolean inUse) throws AMQException
+    public boolean unregisterExchange(String name, boolean inUse) throws AMQException
     {
         final Exchange exchange = _exchangeMap.get(name);
-        if (exchange == null)
+        if (exchange != null)
         {
-            throw new AMQException(AMQConstant.NOT_FOUND, "Unknown exchange " + name, null);
-        }
 
-        if (!_host.getSecurityManager().authoriseDelete(exchange))
-        {
-            throw new AMQSecurityException();
-        }
-
-        // TODO: check inUse argument
+            if (!_host.getSecurityManager().authoriseDelete(exchange))
+            {
+                throw new AMQSecurityException();
+            }
 
-        Exchange e = _exchangeMap.remove(name);
-        if (e != null)
-        {
-            e.close();
+            // TODO: check inUse argument
 
-            synchronized (_listeners)
+            Exchange e = _exchangeMap.remove(name);
+            // if it is null then it was removed by another thread at the same time, we can ignore
+            if (e != null)
             {
-                for(RegistryChangeListener listener : _listeners)
+                e.close();
+
+                synchronized (_listeners)
                 {
-                    listener.exchangeUnregistered(exchange);
+                    for(RegistryChangeListener listener : _listeners)
+                    {
+                        listener.exchangeUnregistered(exchange);
+                    }
                 }
-            }
 
+            }
         }
-        else
-        {
-            throw new AMQException("Unknown exchange " + name);
-        }
+        return exchange != null;
+
     }
 
     public Collection<Exchange> getExchanges()
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/ExchangeInUseException.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/ExchangeInUseException.java
deleted file mode 100644
index 42b58da07e..0000000000
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/ExchangeInUseException.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.exchange;
-
-import org.apache.qpid.AMQException;
-
-/**
- * ExchangeInUseRegistry indicates that an exchange cannot be unregistered because it is currently being used.
- *
- * <p/><table id="crc"><caption>CRC Card</caption>
- * <tr><th> Responsibilities <th> Collaborations
- * <tr><td> Represents failure to unregister exchange that is in use.
- * </table>
- *
- * @todo Not an AMQP exception as no status code.
- *
- * @todo This exception is not used. However, it is part of the ExchangeRegistry interface, and looks like code is
- *       going to need to be added to throw/deal with this. Alternatively ExchangeRegistries may be able to handle the
- *       issue internally.
- */
-public class ExchangeInUseException extends AMQException
-{
-    public ExchangeInUseException(String exchangeName)
-    {
-        super("Exchange " + exchangeName + " is currently in use");
-    }
-}
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/ExchangeRegistry.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/ExchangeRegistry.java
index 7b4dbf925b..743c8eea3f 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/ExchangeRegistry.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/ExchangeRegistry.java
@@ -40,10 +40,9 @@ public interface ExchangeRegistry
      * Unregister an exchange
      * @param exchange name of the exchange to delete
      * @param ifUnused if true, do NOT delete the exchange if it is in use (has queues bound to it)
-     * @throws ExchangeInUseException when the exchange cannot be deleted because it is in use
      * @throws AMQException
      */
-    void unregisterExchange(String exchange, boolean ifUnused)  throws ExchangeInUseException, AMQException;
+    boolean unregisterExchange(String exchange, boolean ifUnused)  throws AMQException;
 
     void clearAndUnregisterMbeans();
 
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/MessageInstance.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/MessageInstance.java
index 49969ce3c1..0bdf83d981 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/MessageInstance.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/MessageInstance.java
@@ -21,9 +21,7 @@
 package org.apache.qpid.server.message;
 
 
-import org.apache.qpid.AMQException;
 import org.apache.qpid.server.filter.Filterable;
-import org.apache.qpid.server.queue.QueueEntry;
 import org.apache.qpid.server.store.TransactionLogResource;
 import org.apache.qpid.server.consumer.Consumer;
 import org.apache.qpid.server.txn.ServerTransaction;
@@ -65,7 +63,7 @@ public interface MessageInstance<M extends MessageInstance<M,C>, C extends Consu
 
     boolean getDeliveredToConsumer();
 
-    boolean expired() throws AMQException;
+    boolean expired();
 
     boolean acquire(C sub);
 
@@ -201,7 +199,7 @@ public interface MessageInstance<M extends MessageInstance<M,C>, C extends Consu
 
     void release();
 
-    boolean resend() throws AMQException;
+    boolean resend();
 
     void delete();
 
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumer.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumer.java
index 5c891797f5..bd4724db20 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumer.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumer.java
@@ -241,7 +241,7 @@ class QueueConsumer<T extends ConsumerTarget, E extends QueueEntryImpl<E,Q,L>, Q
         _target.restoreCredit(queueEntry.getMessage());
     }
 
-    void queueEmpty() throws AMQException
+    void queueEmpty()
     {
         _target.queueEmpty();
     }
@@ -295,12 +295,12 @@ class QueueConsumer<T extends ConsumerTarget, E extends QueueEntryImpl<E,Q,L>, Q
 
 
     @Override
-    public final void flush() throws AMQException
+    public final void flush()
     {
         getQueue().flushConsumer(this);
     }
 
-    boolean resend(final E entry) throws AMQException
+    boolean resend(final E entry)
     {
         return getQueue().resend(entry, this);
     }
@@ -460,14 +460,10 @@ class QueueConsumer<T extends ConsumerTarget, E extends QueueEntryImpl<E,Q,L>, Q
         return _deliveredCount.longValue();
     }
 
-    final void send(final E entry, final boolean batch) throws AMQException
+    final void send(final E entry, final boolean batch)
     {
         _deliveredCount.incrementAndGet();
         ServerMessage message = entry.getMessage();
-        if(message == null)
-        {
-            throw new AMQException("message was null!");
-        }
         _deliveredBytes.addAndGet(message.getSize());
         _target.send(entry, batch);
     }
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java
index ae5c560db0..433daedee9 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java
@@ -158,7 +158,7 @@ public abstract class QueueEntryImpl<E extends QueueEntryImpl<E,Q,L>, Q extends
         return _deliveredToConsumer;
     }
 
-    public boolean expired() throws AMQException
+    public boolean expired()
     {
         ServerMessage message = getMessage();
         if(message != null)
@@ -493,7 +493,7 @@ public abstract class QueueEntryImpl<E extends QueueEntryImpl<E,Q,L>, Q extends
     }
 
     @Override
-    public boolean resend() throws AMQException
+    public boolean resend()
     {
         QueueConsumer<?,E,Q,L> sub = getDeliveredConsumer();
         if(sub != null)
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
index 4450a3ed0c..25b6cac712 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
@@ -793,7 +793,6 @@ abstract class SimpleAMQQueue<E extends QueueEntryImpl<E,Q,L>, Q extends SimpleA
     }
 
     private void deliverMessage(final QueueConsumer<?,E,Q,L> sub, final E entry, boolean batch)
-            throws AMQException
     {
         setLastSeenEntry(sub, entry);
 
@@ -894,7 +893,7 @@ abstract class SimpleAMQQueue<E extends QueueEntryImpl<E,Q,L>, Q extends SimpleA
         _dequeueCount.incrementAndGet();
     }
 
-    public boolean resend(final E entry, final QueueConsumer<?,E,Q,L> consumer) throws AMQException
+    public boolean resend(final E entry, final QueueConsumer<?,E,Q,L> consumer)
     {
         /* TODO : This is wrong as the consumer may be suspended, we should instead change the state of the message
                   entry to resend and move back the consumer pointer. */
@@ -1438,17 +1437,13 @@ abstract class SimpleAMQQueue<E extends QueueEntryImpl<E,Q,L>, Q extends SimpleA
 
     }
 
-    void flushConsumer(QueueConsumer<?,E,Q,L> sub) throws AMQException
+    void flushConsumer(QueueConsumer<?,E,Q,L> sub)
     {
-        // Access control
-        if (!getVirtualHost().getSecurityManager().authoriseConsume(this))
-        {
-            throw new AMQSecurityException("Permission denied: " + getName());
-        }
+
         flushConsumer(sub, Long.MAX_VALUE);
     }
 
-    boolean flushConsumer(QueueConsumer<?,E,Q,L> sub, long iterations) throws AMQException
+    boolean flushConsumer(QueueConsumer<?,E,Q,L> sub, long iterations)
     {
         boolean atTail = false;
         final boolean keepSendLockHeld = iterations <=  SimpleAMQQueue.MAX_ASYNC_DELIVERIES;
@@ -1524,9 +1519,8 @@ abstract class SimpleAMQQueue<E extends QueueEntryImpl<E,Q,L>, Q extends SimpleA
      * @param sub the consumer
      * @param batch true if processing can be batched
      * @return true if we have completed all possible deliveries for this sub.
-     * @throws AMQException
      */
-    private boolean attemptDelivery(QueueConsumer<?,E,Q,L> sub, boolean batch) throws AMQException
+    private boolean attemptDelivery(QueueConsumer<?,E,Q,L> sub, boolean batch)
     {
         boolean atTail = false;
 
@@ -1569,7 +1563,7 @@ abstract class SimpleAMQQueue<E extends QueueEntryImpl<E,Q,L>, Q extends SimpleA
         return atTail || !subActive;
     }
 
-    protected void advanceAllConsumers() throws AMQException
+    protected void advanceAllConsumers()
     {
         QueueConsumerList.ConsumerNodeIterator<E,Q,L> consumerNodeIterator = _consumerList.iterator();
         while (consumerNodeIterator.advance())
@@ -1588,7 +1582,6 @@ abstract class SimpleAMQQueue<E extends QueueEntryImpl<E,Q,L>, Q extends SimpleA
     }
 
     private E getNextAvailableEntry(final QueueConsumer<?,E,Q,L> sub)
-            throws AMQException
     {
         QueueContext<E,Q,L> context = sub.getQueueContext();
         if(context != null)
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/SubFlushRunner.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/SubFlushRunner.java
index c30a48b03a..50af44fed4 100755
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/SubFlushRunner.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/SubFlushRunner.java
@@ -66,10 +66,6 @@ class SubFlushRunner implements Runnable
                 CurrentActor.set(_sub.getLogActor());
                 complete = getQueue().flushConsumer(_sub, ITERATIONS);
             }
-            catch (AMQException e)
-            {
-                _logger.error("Exception during asynchronous delivery by " + toString(), e);
-            }
             catch (final TransportException transe)
             {
                 final String errorMessage = "Problem during asynchronous delivery by " + toString();
diff --git a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/consumer/MockConsumer.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/consumer/MockConsumer.java
index a9b99503ec..2401aaed23 100644
--- a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/consumer/MockConsumer.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/consumer/MockConsumer.java
@@ -153,7 +153,7 @@ public class MockConsumer implements ConsumerTarget
     {
     }
 
-    public void send(MessageInstance entry, boolean batch) throws AMQException
+    public void send(MessageInstance entry, boolean batch)
     {
         if (messages.contains(entry))
         {
@@ -205,7 +205,7 @@ public class MockConsumer implements ConsumerTarget
     }
 
 
-    public void queueEmpty() throws AMQException
+    public void queueEmpty()
     {
     }
 
diff --git a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/MockMessageInstance.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/MockMessageInstance.java
index 386bb46044..8594ba19a3 100644
--- a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/MockMessageInstance.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/MockMessageInstance.java
@@ -71,7 +71,7 @@ public class MockMessageInstance implements MessageInstance<MockMessageInstance,
 
     }
 
-    public boolean expired() throws AMQException
+    public boolean expired()
     {
         return false;
     }
@@ -128,7 +128,7 @@ public class MockMessageInstance implements MessageInstance<MockMessageInstance,
     }
 
     @Override
-    public boolean resend() throws AMQException
+    public boolean resend()
     {
         return false;
     }
diff --git a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTestBase.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTestBase.java
index 45001bda50..7f3c16e8f1 100644
--- a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTestBase.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTestBase.java
@@ -499,14 +499,8 @@ abstract class SimpleAMQQueueTestBase<E extends QueueEntryImpl<E,Q,L>, Q extends
             {
                 QueueEntryImpl entry = (QueueEntryImpl) object;
                 entry.setRedelivered();
-                try
-                {
-                    _consumer.resend(entry);
-                }
-                catch (AMQException e)
-                {
-                    fail("Exception thrown: " + e.getMessage());
-                }
+                _consumer.resend(entry);
+
             }
         });
 
diff --git a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueTest.java
index 27fac12ac0..58b3531897 100644
--- a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueTest.java
@@ -217,7 +217,7 @@ public class StandardQueueTest extends SimpleAMQQueueTestBase<StandardQueueEntry
              * @param entry
              * @param batch
              */
-            public void send(MessageInstance entry, boolean batch) throws AMQException
+            public void send(MessageInstance entry, boolean batch)
             {
                 super.send(entry, batch);
                 latch.countDown();
diff --git a/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConsumerTarget_0_10.java b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConsumerTarget_0_10.java
index 114095bace..c1ee0bc108 100644
--- a/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConsumerTarget_0_10.java
+++ b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConsumerTarget_0_10.java
@@ -191,7 +191,7 @@ public class ConsumerTarget_0_10 extends AbstractConsumerTarget implements FlowC
 
     private final AddMessageDispositionListenerAction _postIdSettingAction;
 
-    public void send(final MessageInstance entry, boolean batch) throws AMQException
+    public void send(final MessageInstance entry, boolean batch)
     {
         ServerMessage serverMsg = entry.getMessage();
 
diff --git a/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java
index 9a90b74656..d3d53504be 100644
--- a/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java
+++ b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java
@@ -29,7 +29,6 @@ import org.apache.qpid.AMQException;
 import org.apache.qpid.AMQStoreException;
 import org.apache.qpid.AMQUnknownExchangeType;
 import org.apache.qpid.server.exchange.Exchange;
-import org.apache.qpid.server.exchange.ExchangeInUseException;
 import org.apache.qpid.server.exchange.HeadersExchange;
 import org.apache.qpid.server.filter.FilterManager;
 import org.apache.qpid.server.filter.FilterManagerFactory;
@@ -887,10 +886,6 @@ public class ServerSessionDelegate extends SessionDelegate
                 virtualHost.removeExchange(exchange, !method.getIfUnused());
             }
         }
-        catch (ExchangeInUseException e)
-        {
-            exception(session, method, ExecutionErrorCode.PRECONDITION_FAILED, "Exchange in use");
-        }
         catch (ExchangeIsAlternateException e)
         {
             exception(session, method, ExecutionErrorCode.NOT_ALLOWED, "Exchange in use as an alternate exchange");
diff --git a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
index 8becdf853b..5afb2069c1 100644
--- a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
@@ -1228,23 +1228,16 @@ public class AMQChannel implements AMQSessionModel, AsyncAutoCommitTransaction.F
                                     @Override
                                     public void postCommit()
                                     {
-                                        try
-                                        {
-                                            final
-                                            ProtocolOutputConverter outputConverter =
+                                        final ProtocolOutputConverter outputConverter =
                                                     _session.getProtocolOutputConverter();
 
-                                            outputConverter.writeReturn(message.getMessagePublishInfo(),
-                                                                        message.getContentHeaderBody(),
-                                                                        message,
-                                                                        _channelId,
-                                                                        AMQConstant.NO_CONSUMERS.getCode(),
-                                                                        IMMEDIATE_DELIVERY_REPLY_TEXT);
-                                        }
-                                        catch (AMQException e)
-                                        {
-                                            throw new RuntimeException(e);
-                                        }
+                                        outputConverter.writeReturn(message.getMessagePublishInfo(),
+                                                                    message.getContentHeaderBody(),
+                                                                    message,
+                                                                    _channelId,
+                                                                    AMQConstant.NO_CONSUMERS.getCode(),
+                                                                    IMMEDIATE_DELIVERY_REPLY_TEXT);
+
                                     }
 
                                     @Override
@@ -1354,23 +1347,14 @@ public class AMQChannel implements AMQSessionModel, AsyncAutoCommitTransaction.F
 
         public void postCommit()
         {
-            try
-            {
-                AMQMessage message = _reference.getMessage();
-                _session.getProtocolOutputConverter().writeReturn(message.getMessagePublishInfo(),
-                                                              message.getContentHeaderBody(),
-                                                              message,
-                                                              _channelId,
-                                                              _errorCode.getCode(),
-                                                              AMQShortString.validValueOf(_description));
-                _reference.release();
-            }
-            catch (AMQException e)
-            {
-                //TODO
-                throw new RuntimeException(e);
-            }
-
+            AMQMessage message = _reference.getMessage();
+            _session.getProtocolOutputConverter().writeReturn(message.getMessagePublishInfo(),
+                                                          message.getContentHeaderBody(),
+                                                          message,
+                                                          _channelId,
+                                                          _errorCode.getCode(),
+                                                          AMQShortString.validValueOf(_description));
+            _reference.release();
         }
 
         public void onRollback()
diff --git a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java
index e83e86981b..ba61afc376 100644
--- a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java
@@ -1670,7 +1670,6 @@ public class AMQProtocolEngine implements ServerProtocolEngine, AMQProtocolSessi
         @Override
         public void deliverToClient(final Consumer sub, final ServerMessage message,
                                     final InstanceProperties props, final long deliveryTag)
-                throws AMQException
         {
             registerMessageDelivered(message.getSize());
             _protocolOutputConverter.writeDeliver(message,
diff --git a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ClientDeliveryMethod.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ClientDeliveryMethod.java
index 2e362c11f8..9f8799f68e 100644
--- a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ClientDeliveryMethod.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ClientDeliveryMethod.java
@@ -28,5 +28,5 @@ import org.apache.qpid.server.consumer.Consumer;
 public interface ClientDeliveryMethod
 {
     void deliverToClient(final Consumer sub, final ServerMessage message, final InstanceProperties props,
-                         final long deliveryTag) throws AMQException;
+                         final long deliveryTag);
 }
diff --git a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ConsumerTarget_0_8.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ConsumerTarget_0_8.java
index 0f0e49bf7f..2ce8caefc9 100644
--- a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ConsumerTarget_0_8.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ConsumerTarget_0_8.java
@@ -114,7 +114,7 @@ public abstract class ConsumerTarget_0_8 extends AbstractConsumerTarget implemen
          * @throws org.apache.qpid.AMQException
          */
         @Override
-        public void send(MessageInstance entry, boolean batch) throws AMQException
+        public void send(MessageInstance entry, boolean batch)
         {
             // We don't decrement the reference here as we don't want to consume the message
             // but we do want to send it to the client.
@@ -177,7 +177,7 @@ public abstract class ConsumerTarget_0_8 extends AbstractConsumerTarget implemen
          * @throws org.apache.qpid.AMQException
          */
         @Override
-        public void send(MessageInstance entry, boolean batch) throws AMQException
+        public void send(MessageInstance entry, boolean batch)
         {
             // if we do not need to wait for client acknowledgements
             // we can decrement the reference count immediately.
@@ -293,7 +293,7 @@ public abstract class ConsumerTarget_0_8 extends AbstractConsumerTarget implemen
          * @throws org.apache.qpid.AMQException
          */
         @Override
-        public void send(MessageInstance entry, boolean batch) throws AMQException
+        public void send(MessageInstance entry, boolean batch)
         {
 
 
@@ -505,7 +505,6 @@ public abstract class ConsumerTarget_0_8 extends AbstractConsumerTarget implemen
     }
 
     protected void sendToClient(final ServerMessage message, final InstanceProperties props, final long deliveryTag)
-            throws AMQException
     {
         _deliveryMethod.deliverToClient(getConsumer(), message, props, deliveryTag);
 
@@ -524,7 +523,7 @@ public abstract class ConsumerTarget_0_8 extends AbstractConsumerTarget implemen
         converter.confirmConsumerAutoClose(getChannel().getChannelId(), getConsumerTag());
     }
 
-    public void queueEmpty() throws AMQException
+    public void queueEmpty()
     {
         if (isAutoClose())
         {
diff --git a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicGetMethodHandler.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicGetMethodHandler.java
index b1d2fa5088..fd4324cee0 100644
--- a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicGetMethodHandler.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicGetMethodHandler.java
@@ -186,7 +186,7 @@ public class BasicGetMethodHandler implements StateAwareMethodListener<BasicGetB
 
         @Override
         public void deliverToClient(final Consumer sub, final ServerMessage message,
-                                    final InstanceProperties props, final long deliveryTag) throws AMQException
+                                    final InstanceProperties props, final long deliveryTag)
         {
             _singleMessageCredit.useCreditForMessage(message.getSize());
             _session.getProtocolOutputConverter().writeGetOk(message,
diff --git a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ExchangeDeleteHandler.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ExchangeDeleteHandler.java
index 75f749fe9a..ce377eee78 100644
--- a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ExchangeDeleteHandler.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ExchangeDeleteHandler.java
@@ -26,7 +26,6 @@ import org.apache.qpid.framing.ExchangeDeleteOkBody;
 import org.apache.qpid.protocol.AMQConstant;
 import org.apache.qpid.server.protocol.v0_8.AMQChannel;
 import org.apache.qpid.server.exchange.Exchange;
-import org.apache.qpid.server.exchange.ExchangeInUseException;
 import org.apache.qpid.server.protocol.v0_8.AMQProtocolSession;
 import org.apache.qpid.server.protocol.v0_8.state.AMQStateManager;
 import org.apache.qpid.server.protocol.v0_8.state.StateAwareMethodListener;
@@ -73,11 +72,6 @@ public class ExchangeDeleteHandler implements StateAwareMethodListener<ExchangeD
 
             session.writeFrame(responseBody.generateFrame(channelId));
         }
-        catch (ExchangeInUseException e)
-        {
-            throw body.getChannelException(AMQConstant.IN_USE, "Exchange in use");
-            // TODO: sort out consistent channel close mechanism that does all clean up etc.
-        }
 
         catch (ExchangeIsAlternateException e)
         {
diff --git a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/output/ProtocolOutputConverter.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/output/ProtocolOutputConverter.java
index 1e69edba91..7678ce812b 100644
--- a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/output/ProtocolOutputConverter.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/output/ProtocolOutputConverter.java
@@ -49,21 +49,19 @@ public interface ProtocolOutputConverter
     void writeDeliver(final ServerMessage msg,
                       final InstanceProperties props, int channelId,
                       long deliveryTag,
-                      AMQShortString consumerTag)
-            throws AMQException;
+                      AMQShortString consumerTag);
 
     void writeGetOk(final ServerMessage msg,
                     final InstanceProperties props,
                     int channelId,
                     long deliveryTag,
-                    int queueSize) throws AMQException;
+                    int queueSize);
 
     byte getProtocolMinorVersion();
 
     byte getProtocolMajorVersion();
 
-    void writeReturn(MessagePublishInfo messagePublishInfo, ContentHeaderBody header, MessageContentSource msgContent,  int channelId, int replyCode, AMQShortString replyText)
-                    throws AMQException;
+    void writeReturn(MessagePublishInfo messagePublishInfo, ContentHeaderBody header, MessageContentSource msgContent,  int channelId, int replyCode, AMQShortString replyText);
 
     void writeFrame(AMQDataBlock block);
 }
diff --git a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/output/ProtocolOutputConverterImpl.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/output/ProtocolOutputConverterImpl.java
index 290a859df6..f786cb113a 100644
--- a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/output/ProtocolOutputConverterImpl.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/output/ProtocolOutputConverterImpl.java
@@ -68,7 +68,6 @@ class ProtocolOutputConverterImpl implements ProtocolOutputConverter
                              final InstanceProperties props, int channelId,
                              long deliveryTag,
                              AMQShortString consumerTag)
-            throws AMQException
     {
         final AMQMessage msg = convertToAMQMessage(m);
         final boolean isRedelivered = Boolean.TRUE.equals(props.getProperty(InstanceProperties.Property.REDELIVERED));
@@ -95,13 +94,11 @@ class ProtocolOutputConverterImpl implements ProtocolOutputConverter
     }
 
     private void writeMessageDelivery(AMQMessage message, int channelId, AMQBody deliverBody)
-            throws AMQException
     {
         writeMessageDelivery(message, message.getContentHeaderBody(), channelId, deliverBody);
     }
 
     private void writeMessageDelivery(MessageContentSource message, ContentHeaderBody contentHeaderBody, int channelId, AMQBody deliverBody)
-            throws AMQException
     {
 
 
@@ -193,7 +190,7 @@ class ProtocolOutputConverterImpl implements ProtocolOutputConverter
                            final InstanceProperties props,
                            int channelId,
                            long deliveryTag,
-                           int queueSize) throws AMQException
+                           int queueSize)
     {
         AMQBody deliver = createEncodedGetOkBody(msg, props, deliveryTag, queueSize);
         writeMessageDelivery(convertToAMQMessage(msg), channelId, deliver);
@@ -204,7 +201,6 @@ class ProtocolOutputConverterImpl implements ProtocolOutputConverter
                                              boolean isRedelivered,
                                              final long deliveryTag,
                                              final AMQShortString consumerTag)
-            throws AMQException
     {
 
         final AMQShortString exchangeName;
@@ -282,7 +278,6 @@ class ProtocolOutputConverterImpl implements ProtocolOutputConverter
     }
 
     private AMQBody createEncodedGetOkBody(ServerMessage msg, InstanceProperties props, long deliveryTag, int queueSize)
-            throws AMQException
     {
         final AMQShortString exchangeName;
         final AMQShortString routingKey;
@@ -316,7 +311,7 @@ class ProtocolOutputConverterImpl implements ProtocolOutputConverter
 
     private AMQBody createEncodedReturnFrame(MessagePublishInfo messagePublishInfo,
                                              int replyCode,
-                                             AMQShortString replyText) throws AMQException
+                                             AMQShortString replyText)
     {
 
         BasicReturnBody basicReturnBody =
@@ -330,7 +325,6 @@ class ProtocolOutputConverterImpl implements ProtocolOutputConverter
     }
 
     public void writeReturn(MessagePublishInfo messagePublishInfo, ContentHeaderBody header, MessageContentSource message, int channelId, int replyCode, AMQShortString replyText)
-            throws AMQException
     {
 
         AMQBody returnFrame = createEncodedReturnFrame(messagePublishInfo, replyCode, replyText);
diff --git a/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQChannelTest.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQChannelTest.java
index b358c7c5c5..317a544b6c 100644
--- a/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQChannelTest.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQChannelTest.java
@@ -61,7 +61,7 @@ public class AMQChannelTest extends QpidTestCase
                     MessageContentSource msgContent,
                     int channelId,
                     int replyCode,
-                    AMQShortString replyText) throws AMQException
+                    AMQShortString replyText)
                     {
                         _replies.put(replyCode, replyText.asString());
                     }
diff --git a/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/InternalTestProtocolSession.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/InternalTestProtocolSession.java
index 1fad8fb41f..4a2fbe44fa 100644
--- a/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/InternalTestProtocolSession.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/InternalTestProtocolSession.java
@@ -99,7 +99,7 @@ public class InternalTestProtocolSession extends AMQProtocolEngine implements Pr
                             MessageContentSource msgContent,
                             int channelId,
                             int replyCode,
-                            AMQShortString replyText) throws AMQException
+                            AMQShortString replyText)
     {
         //To change body of implemented methods use File | Settings | File Templates.
     }
@@ -145,7 +145,7 @@ public class InternalTestProtocolSession extends AMQProtocolEngine implements Pr
     public void writeDeliver(final ServerMessage msg,
                              final InstanceProperties props, int channelId,
                              long deliveryTag,
-                             AMQShortString consumerTag) throws AMQException
+                             AMQShortString consumerTag)
     {
         _deliveryCount.incrementAndGet();
 
@@ -175,7 +175,7 @@ public class InternalTestProtocolSession extends AMQProtocolEngine implements Pr
                            final InstanceProperties props,
                            int channelId,
                            long deliveryTag,
-                           int queueSize) throws AMQException
+                           int queueSize)
     {
     }
 
@@ -246,7 +246,7 @@ public class InternalTestProtocolSession extends AMQProtocolEngine implements Pr
 
         @Override
         public void deliverToClient(Consumer sub, ServerMessage message,
-                                    InstanceProperties props, long deliveryTag) throws AMQException
+                                    InstanceProperties props, long deliveryTag)
         {
             _deliveryCount.incrementAndGet();
 
diff --git a/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ConsumerTarget_1_0.java b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ConsumerTarget_1_0.java
index 027c40aabe..dbfb8f5fc4 100644
--- a/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ConsumerTarget_1_0.java
+++ b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ConsumerTarget_1_0.java
@@ -112,7 +112,7 @@ class ConsumerTarget_1_0 extends AbstractConsumerTarget
         }
     }
 
-    public void send(MessageInstance entry, boolean batch) throws AMQException
+    public void send(MessageInstance entry, boolean batch)
     {
         // TODO
         send(entry);
@@ -123,7 +123,7 @@ class ConsumerTarget_1_0 extends AbstractConsumerTarget
         // TODO
     }
 
-    public void send(final MessageInstance queueEntry) throws AMQException
+    public void send(final MessageInstance queueEntry)
     {
         ServerMessage serverMessage = queueEntry.getMessage();
         Message_1_0 message;
diff --git a/qpid/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java b/qpid/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java
index 2b94aae5b7..2cb4e50415 100644
--- a/qpid/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java
+++ b/qpid/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java
@@ -1111,7 +1111,7 @@ class ManagementNode implements MessageSource<ManagementNodeConsumer,ManagementN
         }
 
         @Override
-        public boolean expired() throws AMQException
+        public boolean expired()
         {
             return false;
         }
@@ -1167,7 +1167,7 @@ class ManagementNode implements MessageSource<ManagementNodeConsumer,ManagementN
         }
 
         @Override
-        public boolean resend() throws AMQException
+        public boolean resend()
         {
             return false;
         }
diff --git a/qpid/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNodeConsumer.java b/qpid/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNodeConsumer.java
index 98bb20d364..ea4b60da13 100644
--- a/qpid/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNodeConsumer.java
+++ b/qpid/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNodeConsumer.java
@@ -161,7 +161,7 @@ class ManagementNodeConsumer implements Consumer
     }
 
     @Override
-    public void flush() throws AMQException
+    public void flush()
     {
 
     }
@@ -186,10 +186,6 @@ class ManagementNodeConsumer implements Consumer
                 _queue.add(responseEntry);
             }
         }
-        catch (AMQException e)
-        {
-            e.printStackTrace();
-        }
         finally
         {
             releaseSendLock();
@@ -230,10 +226,6 @@ class ManagementNodeConsumer implements Consumer
                 }
             }
         }
-        catch (AMQException e)
-        {
-            throw new RuntimeException(e);
-        }
         finally
         {
             releaseSendLock();
diff --git a/qpid/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementResponse.java b/qpid/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementResponse.java
index e25f327420..283dec0f30 100644
--- a/qpid/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementResponse.java
+++ b/qpid/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementResponse.java
@@ -127,7 +127,7 @@ class ManagementResponse implements MessageInstance<ManagementResponse,Managemen
     }
 
     @Override
-    public boolean expired() throws AMQException
+    public boolean expired()
     {
         return false;
     }
@@ -183,7 +183,7 @@ class ManagementResponse implements MessageInstance<ManagementResponse,Managemen
     }
 
     @Override
-    public boolean resend() throws AMQException
+    public boolean resend()
     {
         return false;
     }