You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by m4...@apache.org on 2017/08/14 09:53:22 UTC
[1/2] brooklyn-server git commit: Reverts #206
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 <dr...@googlemail.com>
Authored: Mon Aug 14 10:01:08 2017 +0100
Committer: GitHub <no...@github.com>
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) {
[2/2] brooklyn-server git commit: This closes #795
Posted by m4...@apache.org.
This closes #795
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/9b27d0d4
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/9b27d0d4
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/9b27d0d4
Branch: refs/heads/master
Commit: 9b27d0d4520677ecdbb9e4a96a7731258689c6c1
Parents: 47455e4 8b88c56
Author: Mark McKenna <m4...@gmail.com>
Authored: Mon Aug 14 10:52:56 2017 +0100
Committer: Mark McKenna <m4...@gmail.com>
Committed: Mon Aug 14 10:52:56 2017 +0100
----------------------------------------------------------------------
.../brooklyn/core/mgmt/internal/EntityManagementSupport.java | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
----------------------------------------------------------------------