Author: sshyrkov
Date: Fri Nov 30 18:34:08 2007
New Revision: 19327
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19327&repname=
=3Djahia
Log:
Prevent NPE if the main link object is not found
Modified:
branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/java/org/jahia/ajax/si=
temap/SiteMapAbstractAction.java
Modified: branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/java/org/jahia/a=
jax/sitemap/SiteMapAbstractAction.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-VODAFO=
NE-5-0-2-SP%20BRANCH/core/src/java/org/jahia/ajax/sitemap/SiteMapAbstractAc=
tion.java&rev=3D19327&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-VODAFONE-5-0-2-SP BRANCH/core/src/java/org/jahia/ajax/si=
temap/SiteMapAbstractAction.java (original)
+++ branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/java/org/jahia/ajax/si=
temap/SiteMapAbstractAction.java Fri Nov 30 18:34:08 2007
@@ -127,6 +127,10 @@
final ContentObject main =3D workflowService.getMa=
inLinkObject(contentObject);
// check for cyclic situation
//if ( main !=3D null && !main.getObjectKey().equa=
ls(object.getObjectKey()) ){
+ if (main =3D=3D null) {
+ logger.warn("Main object is null for the conte=
nt object: " + contentObject.getObjectKey());
+ continue;
+ }
if ((main instanceof ContentPage && ((ContentPage)=
main).getParentID(EntryLoadRequest.STAGED) !=3D object.getPageID()) ||
(!(main instanceof ContentPage) && main.ge=
tPageID() !=3D object.getPageID())) {
continue;
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
