diff options
| author | Alex Rudyy <orudyy@apache.org> | 2013-05-22 11:41:53 +0000 |
|---|---|---|
| committer | Alex Rudyy <orudyy@apache.org> | 2013-05-22 11:41:53 +0000 |
| commit | a4c2ad8da3d30a1bde3e2053e3d3d08ac814aa2b (patch) | |
| tree | 5afe46880fb0197cb358a64b533f65493f661bdd /qpid/java/broker/src/main | |
| parent | c8e54a76117dba84f0456ec1a2bfac4428df440a (diff) | |
| download | qpid-python-a4c2ad8da3d30a1bde3e2053e3d3d08ac814aa2b.tar.gz | |
QPID-4876: Throw an exception when virtual host configuration is not found in virtual host file
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1485163 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker/src/main')
| -rw-r--r-- | qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java index 26907ea255..aff84e5832 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java @@ -68,12 +68,11 @@ public class VirtualHostConfiguration extends AbstractConfiguration { Configuration virtualHostConfig = XmlConfigurationUtilities.parseConfig(configurationFile); - // check if it is an old virtual host configuration file which has an element of the same name as virtual host + // check for the element with the same name as virtual host Configuration config = virtualHostConfig.subset("virtualhost." + XmlConfigurationUtilities.escapeTagName(name)); if (config.isEmpty()) { - // assume it is a new configuration which does not have an element of the same name as the virtual host - configuration = virtualHostConfig; + throw new IllegalConfigurationException("No configuration found for virtual host '" + name + "' in " + configurationFile.getAbsolutePath()); } else { |