Author: tdraier
Date: Wed May 16 17:21:12 2007
New Revision: 17325
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17325&repname=
=3Djahia
Log:
do not crash when no site selected for export (JAHIA-1950)
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/importexpo=
rt/ExportEngine.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/impo=
rtexport/ExportEngine.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/engines/importexport/ExportEngine.java&rev=
=3D17325&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-5-0-SP-BRANCH/core/src/java/org/jahia/engines/importexpo=
rt/ExportEngine.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/importexpo=
rt/ExportEngine.java Wed May 16 17:21:12 2007
@@ -143,12 +143,13 @@
=
List sites =3D new ArrayList();
String[] sitekeys =3D processingContext.getParameterValues("si=
tebox");
- for (int i =3D 0; i < sitekeys.length; i++) {
- String sitekey =3D sitekeys[i];
- JahiaSite site =3D ServicesRegistry.getInstance().getJahia=
SitesService().getSiteByKey(sitekey);
- sites.add(site);
+ if (sitekeys !=3D null) {
+ for (int i =3D 0; i < sitekeys.length; i++) {
+ String sitekey =3D sitekeys[i];
+ JahiaSite site =3D ServicesRegistry.getInstance().getJ=
ahiaSitesService().getSiteByKey(sitekey);
+ sites.add(site);
+ }
}
-
resp.setContentType("application/zip");
params.put(ImportExportService.INCLUDE_ALL_FILES, Boolean.TRUE=
);
params.put(ImportExportService.INCLUDE_TEMPLATES, Boolean.TRUE=
);
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
