Author: tdraier
Date: Tue Sep 4 17:29:14 2007
New Revision: 18371
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18371&repname=
=3Djahia
Log:
copy import file to avoid vanishing file
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=3D18371&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 Tue Sep 4 17:29:14 2007
@@ -75,6 +75,7 @@
import org.jahia.utils.zip.JahiaArchiveFileHandler;
import org.quartz.JobDataMap;
import org.quartz.JobDetail;
+import org.apache.commons.io.FileUtils;
=
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
@@ -2068,7 +2069,6 @@
private void prepareFileImports(File f, HttpServletRequest request) {
if (f !=3D null && f.exists()) {
try {
- Map importsInfos =3D new HashMap();
Properties exportProps =3D new Properties();
ZipInputStream zis =3D new ZipInputStream(new FileInputStr=
eam(f));
ZipEntry z;
@@ -2105,22 +2105,21 @@
file.delete();
}
imports.clear();
- Map value =3D prepareSiteImport(f);
- if (value !=3D null) {
- importsInfos.put(f, value);
- }
+ File tempFile =3D File.createTempFile("import", ".=
zip");
+ FileUtils.copyFile(f, tempFile);
+ imports.add(tempFile);
break;
} else {
imports.add(i);
}
}
+ Map importsInfos =3D new HashMap();
for (Iterator iterator =3D imports.iterator(); iterator.ha=
sNext();) {
File i =3D (File) iterator.next();
Map value =3D prepareSiteImport(i);
if (value !=3D null) {
importsInfos.put(i, value);
}
-// i.delete();
}
jParams.getSessionState().setAttribute("importsInfos",impo=
rtsInfos);
} catch (IOException e) {
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
