GUI PRofile Invalidation: Fixed NPE in tests when sessionRegistry is …

…unavailable

Signed-off-by: Tony Tkacik <tonydamage@gmail.com>

model/model-common/src/main/java/com/evolveum/midpoint/model/common/archetypes/ArchetypeManager.java

@@ -27,6 +27,7 @@
 import com.evolveum.midpoint.CacheInvalidationContext;
 import com.evolveum.midpoint.prism.PrismObject;
 import com.evolveum.midpoint.repo.api.Cache;
+import com.evolveum.midpoint.repo.api.CacheInvalidationEventSpecification;
 import com.evolveum.midpoint.repo.api.CacheRegistry;
 import com.evolveum.midpoint.schema.constants.ObjectTypes;
 import com.evolveum.midpoint.schema.expression.ExpressionProfile;
@@ -73,6 +74,12 @@ public class ArchetypeManager implements Cache {
             ObjectTemplateType.class
     );
 
+    private static final Set<CacheInvalidationEventSpecification> CACHE_SPECIFICATION = Collections.unmodifiableSet(
+            CacheInvalidationEventSpecification.setOf(
+                    ArchetypeType.class,
+                    SystemConfigurationType.class,
+                    ObjectTemplateType.class));
+
     @Autowired private SystemObjectCache systemObjectCache;
     @Autowired private CacheRegistry cacheRegistry;
     @Autowired private ArchetypeDeterminer archetypeDeterminer;
@@ -375,6 +382,11 @@ public <O extends ObjectType> ExpressionProfile determineExpressionProfile(Prism
         return systemObjectCache.getExpressionProfile(expressionProfileId, result);
     }
 
+    @Override
+    public Collection<CacheInvalidationEventSpecification> getEventSpecifications() {
+        return CACHE_SPECIFICATION;
+    }
+
     @Override
     public void invalidate(Class<?> type, String oid, CacheInvalidationContext context) {
         // This seems to be harsh (and probably is), but a policy can really depend on a mix of objects. So we have to play

model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/GuiProfiledPrincipalManagerImpl.java

@@ -384,6 +384,11 @@ public Collection<CacheInvalidationEventSpecification> getEventSpecifications()
     @Override
     public <O extends ObjectType> void invalidate(Class<O> type, String oid, boolean clusterwide,
             CacheInvalidationContext context) {
+        if (sessionRegistry == null) {
+            // In tests sessionRegistry is null.
+            return;
+        }
+
         List<Object> loggedInUsers = sessionRegistry.getAllPrincipals();
         for (Object principal : loggedInUsers) {