svn commit: [jahia] r18116 - /trunk/core/src/java/org/jahia/services/cache/CacheEventListener.java

[tdraier]

Author: tdraier
Date: Thu Aug  2 16:45:42 2007
New Revision: 18116

URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18116&repname=
=3Djahia
Log:
avoid npe when validating home page
(port 18080)

Modified:
    trunk/core/src/java/org/jahia/services/cache/CacheEventListener.java

Modified: trunk/core/src/java/org/jahia/services/cache/CacheEventListener.j=
ava
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/services/cache/CacheEventListener.java&rev=3D18116&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
--- trunk/core/src/java/org/jahia/services/cache/CacheEventListener.java (o=
riginal)
+++ trunk/core/src/java/org/jahia/services/cache/CacheEventListener.java Th=
u Aug  2 16:45:42 2007
@@ -97,10 +97,10 @@
         if (ContentPageKey.PAGE_TYPE.equals(objectKey.getType())) {
             objectKey =3D objectKey.getParent(EntryLoadRequest.STAGED);
         }
-        if (ContentFieldKey.FIELD_TYPE.equals(objectKey.getType())) {
+        if (objectKey !=3D null && ContentFieldKey.FIELD_TYPE.equals(objec=
tKey.getType())) {
             objectKey =3D objectKey.getParent(EntryLoadRequest.STAGED);
         }
-        while (ContentContainerKey.CONTAINER_TYPE.equals(objectKey.getType=
())) {
+        while (objectKey !=3D null && ContentContainerKey.CONTAINER_TYPE.e=
quals(objectKey.getType())) {
             for (Iterator iterator =3D languageCodes.iterator(); iterator.=
hasNext();) {
                 String languageCode =3D iterator.next().toString();
                 String key =3D objectKey + languageCode;

_______________________________________________
cvs_list mailing list
cvs_list@jahia.org
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list