Author: solomax
Date: Sat Oct 15 12:25:33 2016
New Revision: 1765044
URL: http://svn.apache.org/viewvc?rev=1765044&view=rev
Log:
[OPENMEETINGS-1457] image import seems to be fixed
Modified:
openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
Modified:
openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java?rev=1765044&r1=1765043&r2=1765044&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
Sat Oct 15 12:25:33 2016
@@ -1209,12 +1209,13 @@ public class BackupImport {
}
}
} else if (FILES_DIR.equals(fName)) {
+ log.debug("Entered FILES folder
");
for (File rf :
file.listFiles()) {
// going to fix images
if (rf.isFile() &&
rf.getName().endsWith(EXTENSION_JPG)) {
FileUtils.copyFileToDirectory(rf, getImgDir(rf.getName()));
} else {
-
FileUtils.copyDirectory(rf, getUploadFilesDir());
+
FileUtils.copyDirectory(rf, new File(getUploadFilesDir(), rf.getName()));
}
}
} else {
Modified:
openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java?rev=1765044&r1=1765043&r2=1765044&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
(original)
+++
openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
Sat Oct 15 12:25:33 2016
@@ -1209,12 +1209,13 @@ public class BackupImport {
}
}
} else if (FILES_DIR.equals(fName)) {
+ log.debug("Entered FILES folder
");
for (File rf :
file.listFiles()) {
// going to fix images
if (rf.isFile() &&
rf.getName().endsWith(EXTENSION_JPG)) {
FileUtils.copyFileToDirectory(rf, getImgDir(rf.getName()));
} else {
-
FileUtils.copyDirectory(rf, getUploadFilesDir());
+
FileUtils.copyDirectory(rf, new File(getUploadFilesDir(), rf.getName()));
}
}
} else {
