You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2010/09/28 00:52:38 UTC
svn commit: r1001946 -
/qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
Author: robbie
Date: Mon Sep 27 22:52:38 2010
New Revision: 1001946
URL: http://svn.apache.org/viewvc?rev=1001946&view=rev
Log:
QPID-2868: guard against non-existent destinations when moving/copying
Modified:
qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
Modified: qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java?rev=1001946&r1=1001945&r2=1001946&view=diff
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java (original)
+++ qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java Mon Sep 27 22:52:38 2010
@@ -860,10 +860,15 @@ public class SimpleAMQQueue implements A
public void moveMessagesToAnotherQueue(final long fromMessageId,
final long toMessageId,
String queueName,
- StoreContext storeContext)
+ StoreContext storeContext) throws IllegalArgumentException
{
AMQQueue toQueue = getVirtualHost().getQueueRegistry().getQueue(new AMQShortString(queueName));
+ if (toQueue == null)
+ {
+ throw new IllegalArgumentException("Queue '" + queueName + "' is not registered with the virtualhost.");
+ }
+
MessageStore store = getVirtualHost().getMessageStore();
List<QueueEntry> entries = getMessagesOnTheQueue(new QueueEntryFilter()
@@ -945,9 +950,14 @@ public class SimpleAMQQueue implements A
public void copyMessagesToAnotherQueue(final long fromMessageId,
final long toMessageId,
String queueName,
- final StoreContext storeContext)
+ final StoreContext storeContext) throws IllegalArgumentException
{
AMQQueue toQueue = getVirtualHost().getQueueRegistry().getQueue(new AMQShortString(queueName));
+ if (toQueue == null)
+ {
+ throw new IllegalArgumentException("Queue '" + queueName + "' is not registered with the virtualhost.");
+ }
+
MessageStore store = getVirtualHost().getMessageStore();
List<QueueEntry> entries = getMessagesOnTheQueue(new QueueEntryFilter()
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org