fixed null pointer exeption will viewing a content record in webtools

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1535291 13f79535-47bb-0310-9956-ffa450edef68
abecam · Oct 24, 2013 · 2d5f290 · 2d5f290
1 parent 834c6ac
commit 2d5f290
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/framework/security/src/org/ofbiz/security/SecurityFactory.java b/framework/security/src/org/ofbiz/security/SecurityFactory.java
@@ -120,7 +120,7 @@ public Delegator getDelegator() {
 
         @Override
         public boolean hasEntityPermission(String entity, String action, GenericValue userLogin) {
-            if (userLogin == null) return false;
+            if (userLogin == null || entity == null || action == null) return false;
             String permission = entity.concat(action);
             String adminPermission = entity.concat("_ADMIN");
             Iterator<GenericValue> iterator = findUserLoginSecurityGroupByUserLoginId(userLogin.getString("userLoginId"));