shuber 2005/04/25 15:51:54 CEST
Modified files: (Branch: JAHIA-4-1-BRANCH)
src/java/org/jahia/services/acl JahiaACL.java
Log:
Bugfix : fixed NullPointerException when validating home page of new site.
Revision Changes Path
1.20.4.4.2.4 +2 -1 jahia/src/java/org/jahia/services/acl/JahiaACL.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/services/acl/JahiaACL.java.diff?r1=1.20.4.4.2.3&r2=1.20.4.4.2.4&f=h
Index: JahiaACL.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/services/acl/Attic/JahiaACL.java,v
retrieving revision 1.20.4.4.2.3
retrieving revision 1.20.4.4.2.4
diff -u -r1.20.4.4.2.3 -r1.20.4.4.2.4
--- JahiaACL.java 13 Apr 2005 13:08:05 -0000 1.20.4.4.2.3
+++ JahiaACL.java 25 Apr 2005 13:51:54 -0000 1.20.4.4.2.4
@@ -350,7 +350,8 @@
Vector result = getNameList (userTable, entry);
for (int k = 0; k < result.size (); k++) {
logger.debug ("Name=" + (String) result.get (k));
- if (getParent(aclResource).getACL() != null) {
+ if (getParent(aclResource) != null &&
+ getParent(aclResource).getACL() != null) {
JahiaUser user = ServicesRegistry
.getInstance ()
.getJahiaUserManagerService ()
