Fix: CurrentPermissionsWriter for ADMIN

6f253335 · Matija Obreza · cd95da72 · 6f253335
Commit 6f253335 authored Oct 29, 2018 by Matija Obreza
Show whitespace changes
Inline Side-by-side

Showing with 10 additions and 10 deletions

security/src/main/java/org/genesys/blocks/security/serialization/CurrentPermissionsWriter.java ...ocks/security/serialization/CurrentPermissionsWriter.java +10 -10

No files found.
--- a/security/src/main/java/org/genesys/blocks/security/serialization/CurrentPermissionsWriter.java
+++ b/security/src/main/java/org/genesys/blocks/security/serialization/CurrentPermissionsWriter.java
@@ -100,8 +100,7 @@ public class CurrentPermissionsWriter extends VirtualBeanPropertyWriter {
 		
 		if (SecurityContextUtil.hasRole("ADMINISTRATOR")) {
 			perms.grantAll();
-		}
-
+		} else {
 			try {
 				perms.create = SecurityContextUtil.hasPermission(bean, BasePermission.CREATE);
 				perms.read = SecurityContextUtil.hasPermission(bean, BasePermission.READ);
@@ -111,6 +110,7 @@ public class CurrentPermissionsWriter extends VirtualBeanPropertyWriter {
 			} catch (Throwable e) {
 				LOG.warn("Could not read current permissions {}", e.getMessage());
 			}
+		}
 		return perms;
 	}