Repository: kylin Updated Branches: refs/heads/1.x-staging 80171d6ae -> 8eb289d52
KYLIN-1329 Bug fix for ACL exception when deleting model Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/8eb289d5 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/8eb289d5 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/8eb289d5 Branch: refs/heads/1.x-staging Commit: 8eb289d52955b4ee7ae65acfbb7ba03f27e8f2d4 Parents: 80171d6 Author: lidongsjtu <lid...@apache.org> Authored: Wed Jan 20 16:02:43 2016 +0800 Committer: lidongsjtu <lid...@apache.org> Committed: Wed Jan 20 16:02:43 2016 +0800 ---------------------------------------------------------------------- .../java/org/apache/kylin/rest/service/AccessService.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/8eb289d5/server/src/main/java/org/apache/kylin/rest/service/AccessService.java ---------------------------------------------------------------------- diff --git a/server/src/main/java/org/apache/kylin/rest/service/AccessService.java b/server/src/main/java/org/apache/kylin/rest/service/AccessService.java index 216c454..2f0e05a 100644 --- a/server/src/main/java/org/apache/kylin/rest/service/AccessService.java +++ b/server/src/main/java/org/apache/kylin/rest/service/AccessService.java @@ -56,10 +56,9 @@ import org.springframework.util.Assert; public class AccessService { @Autowired - private AclService aclService; - - @Autowired UserService userService; + @Autowired + private AclService aclService; // ~ Methods to manage acl life circle of domain objects ~ @@ -219,6 +218,10 @@ public class AccessService { public void clean(AclEntity ae, boolean deleteChildren) { Assert.notNull(ae, "Acl domain object required"); + // For those may have null uuid, like DataModel, won't delete Acl. + if (ae.getId() == null) + return; + ObjectIdentity objectIdentity = new ObjectIdentityImpl(ae.getClass(), ae.getId()); try {
