summaryrefslogtreecommitdiff
path: root/qpid/java
diff options
context:
space:
mode:
Diffstat (limited to 'qpid/java')
-rw-r--r--qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java5
-rw-r--r--qpid/java/systests/src/main/java/org/apache/qpid/server/ack/TxAckTest.java2
2 files changed, 6 insertions, 1 deletions
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java
index 977bd84491..b25a56344e 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java
@@ -149,6 +149,11 @@ public class VirtualHost implements Accessable
public VirtualHost(String name, Configuration hostConfig, MessageStore store) throws Exception
{
+ if (name == null || name.length() == 0)
+ {
+ throw new IllegalArgumentException("Illegal name (" + name + ") for virtualhost.");
+ }
+
_name = name;
_virtualHostMBean = new VirtualHostMBean();
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/ack/TxAckTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/ack/TxAckTest.java
index 45db47a1c3..98639f6970 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/ack/TxAckTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/ack/TxAckTest.java
@@ -110,7 +110,7 @@ public class TxAckTest extends TestCase
new LinkedList<RequiredDeliveryException>()
);
AMQQueue queue =
- AMQQueueFactory.createAMQQueueImpl(new AMQShortString("test"), false, null, false, new VirtualHost("", new MemoryMessageStore()),
+ AMQQueueFactory.createAMQQueueImpl(new AMQShortString("test"), false, null, false, new VirtualHost("test", new MemoryMessageStore()),
null);
for (int i = 0; i < messageCount; i++)