Author: tdraier
Date: Wed Jun 20 14:48:55 2007
New Revision: 17665
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17665&repname=
=3Djahia
Log:
avoid npe (JAHIA-2057)
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/filemanage=
r/DAVFilemanager_Engine.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/file=
manager/DAVFilemanager_Engine.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/engines/filemanager/DAVFilemanager_Engine.j=
ava&rev=3D17665&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/filemanage=
r/DAVFilemanager_Engine.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/filemanage=
r/DAVFilemanager_Engine.java Wed Jun 20 14:48:55 2007
@@ -1856,12 +1856,14 @@
if (theEntry.getWorkflow() =3D=3D EntryLoadRequest.VERSIONED_W=
ORKFLOW_STATE) continue;
final JahiaField field =3D theEntry.getField();
=
- // Get all the groups which can see the field
- final Vector fieldACLGroups =3D field.getACL().getGroupnameLis=
tNoAdmin(aclEntry);
- logger.debug("fieldACLGroups with READ: " + fieldACLGroups);
-
- if (fieldACLGroups.contains(entryName)) {
- result.add(new Object[]{theEntry, entryName});
+ if (field !=3D null) {
+ // Get all the groups which can see the field
+ final Vector fieldACLGroups =3D field.getACL().getGroupnam=
eListNoAdmin(aclEntry);
+ logger.debug("fieldACLGroups with READ: " + fieldACLGroups=
);
+
+ if (fieldACLGroups.contains(entryName)) {
+ result.add(new Object[]{theEntry, entryName});
+ }
}
}
return result;
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
