summaryrefslogtreecommitdiff
path: root/qpid/java/broker-plugins/access-control/src/main
diff options
context:
space:
mode:
authorRobert Godfrey <rgodfrey@apache.org>2014-03-03 15:35:25 +0000
committerRobert Godfrey <rgodfrey@apache.org>2014-03-03 15:35:25 +0000
commit0d6d2adbb434f05f63414fc3fb5441345666a862 (patch)
treed8551a39259683d58d1b1a82c003b1b8fe4919b5 /qpid/java/broker-plugins/access-control/src/main
parentaf2c37483f182bb67fd71a1fbb68f921c839728b (diff)
downloadqpid-python-0d6d2adbb434f05f63414fc3fb5441345666a862.tar.gz
QPID-5596 : [Java] Address bugs found by FindBugs
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1573586 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker-plugins/access-control/src/main')
-rw-r--r--qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/PlainConfiguration.java2
-rw-r--r--qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleSet.java3
2 files changed, 2 insertions, 3 deletions
diff --git a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/PlainConfiguration.java b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/PlainConfiguration.java
index 31c345f718..34585bb4f6 100644
--- a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/PlainConfiguration.java
+++ b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/PlainConfiguration.java
@@ -148,7 +148,7 @@ public class PlainConfiguration extends AbstractConfiguration
{
if(StringUtils.equalsIgnoreCase("GROUP", first))
{
- throw new IllegalConfigurationException(String.format("GROUP keyword not supported. Groups should defined via a Group Provider, not in the ACL file.", getLine()));
+ throw new IllegalConfigurationException(String.format("GROUP keyword not supported at line %d. Groups should defined via a Group Provider, not in the ACL file.", getLine()));
}
else if (StringUtils.equalsIgnoreCase(CONFIG, first))
{
diff --git a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleSet.java b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleSet.java
index 2e2b6b2041..fcb5bcbf70 100644
--- a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleSet.java
+++ b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleSet.java
@@ -185,7 +185,6 @@ public class RuleSet
public void addRule(Integer number, String identity, Permission permission, AclAction action)
{
- _cache.clear();
if (!action.isAllowed())
{
@@ -211,7 +210,7 @@ public class RuleSet
}
// save rule
- _cache.remove(identity);
+ _cache.clear();
_rules.put(rule.getNumber(), rule);
}