diff options
| author | Andrew Donald Kennedy <grkvlt@apache.org> | 2010-12-06 16:05:46 +0000 |
|---|---|---|
| committer | Andrew Donald Kennedy <grkvlt@apache.org> | 2010-12-06 16:05:46 +0000 |
| commit | 80ba5c5efdc23e3922b8f8f5152ceeaefa6951b6 (patch) | |
| tree | 2eb2141eb77d43701e718b5b5ab1cbd07401015f /qpid/java/broker-plugins/access-control | |
| parent | 1d44d6e7a3369fb7773ba50d02c3baa8955da382 (diff) | |
| download | qpid-python-grkvlt-network-20101013.tar.gz | |
Attempt one at merge from r1021441:HEADgrkvlt-network-20101013
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/grkvlt-network-20101013@1042697 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker-plugins/access-control')
| -rw-r--r-- | qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AbstractConfiguration.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AbstractConfiguration.java b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AbstractConfiguration.java index a684e52ce4..e8e630842c 100644 --- a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AbstractConfiguration.java +++ b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AbstractConfiguration.java @@ -61,7 +61,7 @@ public abstract class AbstractConfiguration implements ConfigurationFile public RuleSet reload() { RuleSet oldRules = _config; - + try { RuleSet newRules = load(); |