Author: sebawagner
Date: Sat Aug 11 12:30:02 2012
New Revision: 1371927
URL: http://svn.apache.org/viewvc?rev=1371927&view=rev
Log:
OPENMEETINGS-394 Fixes exception when saving whiteboard to file explorer
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/documents/LibraryDocumentConverter.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/documents/LibraryWmlLoader.java
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/documents/LibraryDocumentConverter.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/documents/LibraryDocumentConverter.java?rev=1371927&r1=1371926&r2=1371927&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/documents/LibraryDocumentConverter.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/documents/LibraryDocumentConverter.java
Sat Aug 11 12:30:02 2012
@@ -36,11 +36,11 @@ public class LibraryDocumentConverter {
private static final String fileExt = ".wml";
private static final String wmlFolderName = "stored" +
File.separatorChar;
-
- public static String writeToLocalFolder(File localFolder, String
fileName, @SuppressWarnings("rawtypes")ArrayList objList) {
+
+ public static String writeToLocalFolder(File uploadRootDir, String
fileName, @SuppressWarnings("rawtypes")ArrayList objList) {
try {
- log.debug("filePath: "+localFolder);
+ log.debug("filePath: "+uploadRootDir.getAbsolutePath());
String fileNameExtName =
fileName.substring(fileName.length()-4,fileName.length());
if (fileNameExtName.equals(fileExt)){
@@ -54,34 +54,32 @@ public class LibraryDocumentConverter {
return "-20";
}
- File filepathComplete = new File(localFolder,
wmlFolderName + fileName + fileExt);
+ File filePathComplete = new
File(uploadRootDir.getAbsolutePath() + File.separatorChar + wmlFolderName +
fileName + fileExt);
- //Add the Folder for the Room if it does not exist yet
- if (!localFolder.exists()){
- localFolder.mkdir();
- }
//Add the Folder for the wmlFiles if it does not exist
yet
- File localFolder2 = new File(localFolder +
wmlFolderName);
+ File localFolder2 = new
File(uploadRootDir.getAbsolutePath() + File.separatorChar + wmlFolderName);
if (!localFolder2.exists()){
localFolder2.mkdir();
}
- if (filepathComplete.exists()){
+ if (filePathComplete.exists()){
return "-20";
}
XStream xStream = new XStream(new XppDriver());
xStream.setMode(XStream.NO_REFERENCES);
- String xmlString = xStream.toXML(objList);
+ String xmlString = xStream.toXML(objList);
+
+ log.debug("Write to "+filePathComplete);
- PrintWriter pw = new PrintWriter(new
FileWriter(filepathComplete));
+ PrintWriter pw = new PrintWriter(new
FileWriter(filePathComplete));
pw.println(xmlString);
pw.flush();
pw.close();
//return new Long(1);
- return filepathComplete.getCanonicalPath();
+ return filePathComplete.getCanonicalPath();
} catch (Exception err){
log.error("writeToLocalFolder",err);
}
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/documents/LibraryWmlLoader.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/documents/LibraryWmlLoader.java?rev=1371927&r1=1371926&r2=1371927&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/documents/LibraryWmlLoader.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/documents/LibraryWmlLoader.java
Sat Aug 11 12:30:02 2012
@@ -49,7 +49,7 @@ public class LibraryWmlLoader {
name += fileExt;
}
File filepathComplete = new File(file, name);
- log.error("filepathComplete: "+filepathComplete);
+ log.debug("filepathComplete: "+filepathComplete);
XStream xStream = new XStream(new XppDriver());
xStream.setMode(XStream.NO_REFERENCES);
@@ -61,7 +61,7 @@ public class LibraryWmlLoader {
}
reader.close();
//lMap = (LinkedHashMap) xStream.fromXML(xmlString);
- ArrayList lMapList = (ArrayList) xStream.fromXML(xmlString);
+ ArrayList lMapList = (ArrayList) xStream.fromXML(xmlString);
return lMapList;
} catch (Exception err){
