svn commit: r1535291 - /ofbiz/trunk/framework/security/src/org/ofbiz/security/SecurityFactory.java

[hansbak]

Author: hansbak
Date: Thu Oct 24 07:03:52 2013
New Revision: 1535291

URL: http://svn.apache.org/r1535291
Log:
fixed null pointer exeption will viewing a content record in webtools

Modified:
    ofbiz/trunk/framework/security/src/org/ofbiz/security/SecurityFactory.java

Modified: 
ofbiz/trunk/framework/security/src/org/ofbiz/security/SecurityFactory.java
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/security/src/org/ofbiz/security/SecurityFactory.java?rev=1535291&r1=1535290&r2=1535291&view=diff
==============================================================================
--- ofbiz/trunk/framework/security/src/org/ofbiz/security/SecurityFactory.java 
(original)
+++ ofbiz/trunk/framework/security/src/org/ofbiz/security/SecurityFactory.java 
Thu Oct 24 07:03:52 2013
@@ -120,7 +120,7 @@ public final class SecurityFactory {
 
         @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"));