Author: xlawrence
Date: Fri Jun 29 10:56:30 2007
New Revision: 17827
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17827&repname=
=3Djahia
Log:
Backport resolution of JAHIA-1931
Modified:
trunk/core/src/java/org/jahia/admin/sites/ManageSites.java
Modified: trunk/core/src/java/org/jahia/admin/sites/ManageSites.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/admin/sites/ManageSites.java&rev=3D17827&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
--- trunk/core/src/java/org/jahia/admin/sites/ManageSites.java (original)
+++ trunk/core/src/java/org/jahia/admin/sites/ManageSites.java Fri Jun 29 1=
0:56:30 2007
@@ -99,7 +99,7 @@
public class ManageSites {
// ------------------------------ FIELDS ------------------------------
=
- private static org.apache.log4j.Logger logger =3D
+ private static final org.apache.log4j.Logger logger =3D
org.apache.log4j.Logger.getLogger(ManageSites.class);
=
private static final String CLASS_NAME =3D JahiaAdministration.CLASS_N=
AME;
@@ -1831,13 +1831,15 @@
=
List sites =3D new ArrayList();
String[] sitekeys =3D request.getParameterValues("sitebox");
+ if (sitekeys !=3D null) {
for (int i =3D 0; i < sitekeys.length; i++) {
- String sitekey =3D sitekeys[i];
+ final String sitekey =3D sitekeys[i];
try {
- JahiaSite site =3D ServicesRegistry.getInstance().getJahia=
SitesService().getSiteByKey(sitekey);
+ final JahiaSite site =3D ServicesRegistry.getInstance(=
).getJahiaSitesService().getSiteByKey(sitekey);
sites.add(site);
} catch (JahiaException e) {
-
+ logger.error("Error getting site: " + sitekey);
+ }
}
}
request.setAttribute("sites",sites);
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
