diff options
author | Robert Gemmell <robbie@apache.org> | 2009-12-01 14:22:44 +0000 |
---|---|---|
committer | Robert Gemmell <robbie@apache.org> | 2009-12-01 14:22:44 +0000 |
commit | 5889e5364ebbb3a5c936b3dec527bba85f1ce565 (patch) | |
tree | 47e4f0f5c2aa5a7f593b282bf24984e5a1351451 /java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java | |
parent | 4497af06e34c177b4b84a5dff74a254a3d05fb2f (diff) | |
download | qpid-python-5889e5364ebbb3a5c936b3dec527bba85f1ce565.tar.gz |
QPID-2184: replace random 1second wait with a LogMonitor check that the reload has occured. Also update some method and paramter names
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@885765 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java')
-rw-r--r-- | java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java b/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java index 23041061be..89b825b270 100644 --- a/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java +++ b/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java @@ -877,7 +877,7 @@ public class ServerConfigurationTest extends TestCase // Switch to deny the connection writeConfigFile(mainFile, true); - reg.getConfiguration().reparseConfigFile(); + reg.getConfiguration().reparseConfigFileSecuritySections(); assertTrue(reg.getAccessManager().authoriseConnect(session, virtualHost)); @@ -995,7 +995,7 @@ public class ServerConfigurationTest extends TestCase out.write("</firewall>\n"); out.close(); - reg.getConfiguration().reparseConfigFile(); + reg.getConfiguration().reparseConfigFileSecuritySections(); assertTrue(reg.getAccessManager().authoriseConnect(session, virtualHost)); @@ -1010,7 +1010,7 @@ public class ServerConfigurationTest extends TestCase out.write("</firewall>\n"); out.close(); - reg.getConfiguration().reparseConfigFile(); + reg.getConfiguration().reparseConfigFileSecuritySections(); assertFalse(reg.getAccessManager().authoriseConnect(session, virtualHost)); } |