Author: sshyrkov
Date: Tue Oct 30 09:58:01 2007
New Revision: 18995
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18995&repname=
=3Djahia
Log:
[trunk r18982] avoid JahiaPageNotFoundException when encountering bad links=
(JAHIA-2582)
Modified:
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/impo=
rtexport/ImportExportBaseService.java
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/service=
s/importexport/ImportExportBaseService.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/services/importexport/ImportExportBase=
Service.java&rev=3D18995&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-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/impo=
rtexport/ImportExportBaseService.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/impo=
rtexport/ImportExportBaseService.java Tue Oct 30 09:58:01 2007
@@ -770,7 +770,13 @@
case JahiaPage.TYPE_LINK:
currentPage =3D ContentPage.getPage(cp.getParentID=
(toLoadRequest));
elementName =3D "link";
- attr.addAttribute(JAHIA_URI, "reference", "jahia:r=
eference", "CDATA", getUuid(ContentPage.getPage(cp.getPageLinkID(toLoadRequ=
est))));
+ String refuuid =3D null;
+ try {
+ refuuid =3D getUuid(ContentPage.getPage(cp.get=
PageLinkID(toLoadRequest)));
+ } catch (JahiaPageNotFoundException e) {
+ refuuid =3D "";
+ } =
+ attr.addAttribute(JAHIA_URI, "reference", "jahia:r=
eference", "CDATA", refuuid);
if (view) {
if (title !=3D null) {
attr.addAttribute(JAHIA_URI, "title", "jah=
ia:title", "CDATA", title);
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
