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@885765 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 3 insertions, 3 deletions

diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
index 23041061be..89b825b270 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
+++ b/qpid/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));
     }