Author: xlawrence
Date: Tue May 22 16:54:21 2007
New Revision: 17349
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17349&repname=
=3Djahia
Log:
avoid NPE if nested content object is null
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/gui/HTMLToolBox.ja=
va
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/gui/HTMLTool=
Box.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/gui/HTMLToolBox.java&rev=3D17349&repname=3D=
jahia
=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/gui/HTMLToolBox.ja=
va (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/gui/HTMLToolBox.ja=
va Tue May 22 16:54:21 2007
@@ -1208,7 +1208,7 @@
return false;
}
=
- if (contentObject =3D=3D null) {
+ if (contentObject =3D=3D null || contentObject.getContentObject() =
=3D=3D null) {
// No object -> No menu...
return false;
}
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
