Repository: kylin Updated Branches: refs/heads/2.0-rc 32bdcdbd3 -> dfcebb3ea
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/203f63ba Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/203f63ba Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/203f63ba Branch: refs/heads/2.0-rc Commit: 203f63baa0fa0e4cae3a5cabe1dfedbd8e3c0d8d Parents: 32bdcdb Author: lidongsjtu <don...@ebay.com> Authored: Tue Jan 19 10:29:22 2016 +0800 Committer: lidongsjtu <don...@ebay.com> Committed: Tue Jan 19 10:40:17 2016 +0800 ---------------------------------------------------------------------- .../main/java/org/apache/kylin/rest/service/AccessService.java | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/203f63ba/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 cd93eba..5370bba 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 @@ -219,6 +219,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 {
