svn commit: [jahia] r18981 - /branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/importexport/ImportExportBaseService.java

[tdraier]

Author: tdraier
Date: Mon Oct 29 15:54:16 2007
New Revision: 18981

URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18981&repname=
=3Djahia
Log:
avoid JahiaPageNotFoundException when encountering bad links (JAHIA-2582)

Modified:
    branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/importexport/Impo=
rtExportBaseService.java

Modified: branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/importexpor=
t/ImportExportBaseService.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-4-1-BR=
ANCH/src/java/org/jahia/services/importexport/ImportExportBaseService.java&=
rev=3D18981&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-4-1-BRANCH/src/java/org/jahia/services/importexport/Impo=
rtExportBaseService.java (original)
+++ branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/importexport/Impo=
rtExportBaseService.java Mon Oct 29 15:54:16 2007
@@ -662,7 +662,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
cvs_list@jahia.org
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list