Author: tdraier
Date: Thu Sep 27 17:28:13 2007
New Revision: 18700
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18700&repname=
=3Djahia
Log:
avoid npe when trimming names
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/admin/sites/Manage=
Sites.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/admin/sites/=
ManageSites.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/admin/sites/ManageSites.java&rev=3D18700&re=
pname=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/admin/sites/Manage=
Sites.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/admin/sites/Manage=
Sites.java Thu Sep 27 17:28:13 2007
@@ -2193,9 +2193,9 @@
for (Iterator iterator =3D importsInfos.keySet().iterator(); itera=
tor.hasNext();) {
File file =3D (File) iterator.next();
Map infos =3D (Map) importsInfos.get(file);
- infos.put("sitekey", request.getParameter(file.getName()+"site=
Key").trim());
- infos.put("siteservername", request.getParameter(file.getName(=
)+"siteServerName").trim());
- infos.put("sitetitle", request.getParameter(file.getName()+"si=
teTitle").trim());
+ infos.put("sitekey", request.getParameter(file.getName()+"site=
Key")=3D=3Dnull?null:request.getParameter(file.getName()+"siteKey").trim());
+ infos.put("siteservername", request.getParameter(file.getName(=
)+"siteServerName")=3D=3Dnull?null:request.getParameter(file.getName()+"sit=
eServerName").trim());
+ infos.put("sitetitle", request.getParameter(file.getName()+"si=
teTitle")=3D=3Dnull?null:request.getParameter(file.getName()+"siteTitle").t=
rim());
infos.put("selected", request.getParameter(file.getName()+"sel=
ected"));
infos.put("templates",request.getParameter(file.getName()+"tem=
plates"));
=
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
