Repository: brooklyn-server Updated Branches: refs/heads/master 47455e411 -> 9b27d0d45
Reverts #206 Reverts #206 incorrectly merged Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/8b88c569 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/8b88c569 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/8b88c569 Branch: refs/heads/master Commit: 8b88c56945997f0f51933a85257b0bd1d2999a7c Parents: 47455e4 Author: Duncan Godwin <[email protected]> Authored: Mon Aug 14 10:01:08 2017 +0100 Committer: GitHub <[email protected]> Committed: Mon Aug 14 10:01:08 2017 +0100 ---------------------------------------------------------------------- .../brooklyn/core/mgmt/internal/EntityManagementSupport.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/8b88c569/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/EntityManagementSupport.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/EntityManagementSupport.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/EntityManagementSupport.java index 9f91f16..852166b 100644 --- a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/EntityManagementSupport.java +++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/EntityManagementSupport.java @@ -466,12 +466,7 @@ public class EntityManagementSupport { } @Override public void onEffectorStarting(Effector<?> effector, Object parameters) { - try { - Entitlements.checkEntitled(getEntitlementManager(), Entitlements.INVOKE_EFFECTOR, EntityAndItem.of(entity, StringAndArgument.of(effector.getName(), parameters))); - } catch (Exception e) { - if (log.isDebugEnabled()) { log.debug("Error while checking for entitlement {}", effector, e); } - Exceptions.propagate(e); - } + Entitlements.checkEntitled(getEntitlementManager(), Entitlements.INVOKE_EFFECTOR, EntityAndItem.of(entity, StringAndArgument.of(effector.getName(), parameters))); } @Override public void onEffectorCompleted(Effector<?> effector) {
