tdraier 2005/05/02 15:49:22 CEST
Modified files:
src/java/org/jahia/update/core PatchSlide2.java
Log:
added a check when moving files
Revision Changes Path
1.8 +13 -7
jahia_update/src/java/org/jahia/update/core/PatchSlide2.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia_update/src/java/org/jahia/update/core/PatchSlide2.java.diff?r1=1.7&r2=1.8&f=h
Index: PatchSlide2.java
===================================================================
RCS file:
/home/cvs/repository/jahia_update/src/java/org/jahia/update/core/PatchSlide2.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- PatchSlide2.java 21 Apr 2005 16:09:29 -0000 1.7
+++ PatchSlide2.java 2 May 2005 13:49:22 -0000 1.8
@@ -253,13 +253,19 @@
File[] sites = slideRoot.listFiles();
for (int i = 0; i < sites.length; i++) {
File site = sites[i];
- File[] files = site.listFiles();
- File store = new File(site,"store");
- store.mkdir();
- new File(site,"work").mkdir();
- for (int j = 0; j < files.length; j++) {
- File file = files[j];
- file.renameTo(new File(store, file.getName()));
+ try {
+ if (site.isDirectory()) {
+ File[] files = site.listFiles();
+ File store = new File(site,"store");
+ store.mkdir();
+ new File(site,"work").mkdir();
+ for (int j = 0; j < files.length; j++) {
+ File file = files[j];
+ file.renameTo(new File(store, file.getName()));
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
}
}
dbManager.dropTable("jahia_slide_property");