From b7353827ceeb75c4d9402bc0505facc72c1026f3 Mon Sep 17 00:00:00 2001
From: Evgeniy Cheban <mister.cheban@gmail.com>
Date: Tue, 2 May 2017 03:16:07 +0300
Subject: [PATCH] JTALKSCOMMON-53

- added precondition checkNotNull before using mutableAclService.
---
 .../src/main/java/org/jtalks/common/security/acl/AclUtil.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/jtalks-common-security/src/main/java/org/jtalks/common/security/acl/AclUtil.java b/jtalks-common-security/src/main/java/org/jtalks/common/security/acl/AclUtil.java
index 933da71f..068e9150 100644
--- a/jtalks-common-security/src/main/java/org/jtalks/common/security/acl/AclUtil.java
+++ b/jtalks-common-security/src/main/java/org/jtalks/common/security/acl/AclUtil.java
@@ -14,6 +14,7 @@
  */
 package org.jtalks.common.security.acl;
 
+import com.google.common.base.Preconditions;
 import com.google.common.base.Predicate;
 import org.jtalks.common.model.entity.Entity;
 import org.springframework.security.acls.model.*;
@@ -35,6 +36,7 @@
 public class AclUtil {
     private TypeConvertingObjectIdentityGenerator objectIdentityGenerator = createDefaultGenerator();
     private final MutableAclService mutableAclService;
+    private static final String MUTABLE_ACL_SERVICE_IS_NULL = "mutableAclService is null";
 
     /**
      * Use this constructor if you need a full blown ACL utilities.
@@ -68,6 +70,7 @@ public ExtendedMutableAcl getAclFor(Entity entity) {
      * {@inheritDoc}
      */
     public ExtendedMutableAcl getAclFor(ObjectIdentity oid) {
+        Preconditions.checkNotNull(mutableAclService, MUTABLE_ACL_SERVICE_IS_NULL);
         try {
             return ExtendedMutableAcl.castAndCreate(mutableAclService.readAclById(oid));
         } catch (NotFoundException nfe) {
@@ -107,6 +110,7 @@ public ExtendedMutableAcl restrict(List<? extends Sid> sids, List<Permission> pe
      * {@inheritDoc}
      */
     public ExtendedMutableAcl delete(List<? extends Sid> sids, List<Permission> permissions, Entity target) {
+        Preconditions.checkNotNull(mutableAclService, MUTABLE_ACL_SERVICE_IS_NULL);
         ObjectIdentity oid = createIdentityFor(target);
         ExtendedMutableAcl acl = ExtendedMutableAcl.castAndCreate(mutableAclService.readAclById(oid));
         deletePermissionsFromAcl(acl, sids, permissions);