Repository: qpid-broker-j Updated Branches: refs/heads/master 5ab312f49 -> 16a186bab
QPID-7928: Rename method for clarity Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/1a9875c6 Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/1a9875c6 Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/1a9875c6 Branch: refs/heads/master Commit: 1a9875c6bb1859e31d8cbd967aff303ab318d924 Parents: 5ab312f Author: Keith Wall <[email protected]> Authored: Thu Sep 28 16:01:29 2017 +0100 Committer: Keith Wall <[email protected]> Committed: Fri Sep 29 09:45:29 2017 +0100 ---------------------------------------------------------------------- .../src/main/java/org/apache/qpid/server/model/BrokerImpl.java | 2 +- .../org/apache/qpid/server/model/CommonAccessControlProvider.java | 2 +- .../qpid/server/security/AllowAllAccessControlProviderImpl.java | 2 +- .../org/apache/qpid/server/virtualhost/AbstractVirtualHost.java | 2 +- .../access/plugins/AbstractLegacyAccessControlProvider.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/1a9875c6/broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java ---------------------------------------------------------------------- diff --git a/broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java b/broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java index 7c1f5c9..5bc4aaf 100644 --- a/broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java +++ b/broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java @@ -770,7 +770,7 @@ public class BrokerImpl extends AbstractContainer<BrokerImpl> implements Broker< } else if(prov.getState() == State.ACTIVE) { - accessControls.add(prov.getControl()); + accessControls.add(prov.getController()); } } http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/1a9875c6/broker-core/src/main/java/org/apache/qpid/server/model/CommonAccessControlProvider.java ---------------------------------------------------------------------- diff --git a/broker-core/src/main/java/org/apache/qpid/server/model/CommonAccessControlProvider.java b/broker-core/src/main/java/org/apache/qpid/server/model/CommonAccessControlProvider.java index f94a808..b101cd2 100644 --- a/broker-core/src/main/java/org/apache/qpid/server/model/CommonAccessControlProvider.java +++ b/broker-core/src/main/java/org/apache/qpid/server/model/CommonAccessControlProvider.java @@ -51,5 +51,5 @@ public interface CommonAccessControlProvider<X> extends Comparable<X> String getName(); int getPriority(); - AccessControl<?> getControl(); + AccessControl<?> getController(); } http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/1a9875c6/broker-core/src/main/java/org/apache/qpid/server/security/AllowAllAccessControlProviderImpl.java ---------------------------------------------------------------------- diff --git a/broker-core/src/main/java/org/apache/qpid/server/security/AllowAllAccessControlProviderImpl.java b/broker-core/src/main/java/org/apache/qpid/server/security/AllowAllAccessControlProviderImpl.java index a14918d..2ce0179 100644 --- a/broker-core/src/main/java/org/apache/qpid/server/security/AllowAllAccessControlProviderImpl.java +++ b/broker-core/src/main/java/org/apache/qpid/server/security/AllowAllAccessControlProviderImpl.java @@ -55,7 +55,7 @@ public class AllowAllAccessControlProviderImpl extends AbstractConfiguredObject< } @Override - public AccessControl getControl() + public AccessControl getController() { return AccessControl.ALWAYS_ALLOWED; } http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/1a9875c6/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java ---------------------------------------------------------------------- diff --git a/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java b/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java index c37bc78..f5580b3 100644 --- a/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java +++ b/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java @@ -328,7 +328,7 @@ public abstract class AbstractVirtualHost<X extends AbstractVirtualHost<X>> exte } else if(prov.getState() == State.ACTIVE) { - accessControls.add(prov.getControl()); + accessControls.add(prov.getController()); } } http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/1a9875c6/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AbstractLegacyAccessControlProvider.java ---------------------------------------------------------------------- diff --git a/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AbstractLegacyAccessControlProvider.java b/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AbstractLegacyAccessControlProvider.java index eb7085a..3de7b1c 100644 --- a/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AbstractLegacyAccessControlProvider.java +++ b/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AbstractLegacyAccessControlProvider.java @@ -118,7 +118,7 @@ abstract class AbstractLegacyAccessControlProvider<X extends AbstractLegacyAcces @Override - public AccessControl<?> getControl() + public AccessControl<?> getController() { return _accessControl; } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
