antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 7 Projects Releases 5 Activity Actions 1

* Try to be more robust if getInputStream() is called after writeToFile() has been called

Browse source 
by getting the InputStream from the new file instead of the old one, which may not exist 
  anymore. Fixes bug 559 <http://helma.org/bugs/show_bug.cgi?id=559>
* Print error messages when catching Exceptions, plus a little more cleanup.
This commit is contained in:
hns 2007-09-21 14:55:10 +00:00
parent 262eb22335
commit 4b23a48c14
1 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/helma/util/MimePart.java
View file

@ -33,6 +33,7 @@ public class MimePart implements Serializable {
private Date lastModified; private Date lastModified;
private String eTag; private String eTag;
private FileItem fileItem; private FileItem fileItem;
private File file;
/** /**
* Creates a new MimePart object. * Creates a new MimePart object.
@ -90,7 +91,7 @@ public class MimePart implements Serializable {
* @return the mime part content as byte array * @return the mime part content as byte array
*/ */
public byte[] getContent() { public byte[] getContent() {
if (content == null && fileItem != null) { if (content == null && (fileItem != null || file != null)) {
loadContent(); loadContent();
} }
return content; return content;
@ -99,7 +100,7 @@ public class MimePart implements Serializable {
private synchronized void loadContent() { private synchronized void loadContent() {
content = new byte[contentLength]; content = new byte[contentLength];
try { try {
InputStream in = fileItem.getInputStream(); InputStream in = getInputStream();
int read = 0; int read = 0;
while (read < contentLength) { while (read < contentLength) {
int r = in.read(content, read, contentLength - read); int r = in.read(content, read, contentLength - read);
@ -108,7 +109,8 @@ public class MimePart implements Serializable {
read += r; read += r;
} }
in.close(); in.close();
} catch (IOException iox) { } catch (Exception x) {
System.err.println("Error in MimePart.loadContent(): " + x);
content = new byte[0]; content = new byte[0];
} }
} }
@ -119,10 +121,14 @@ public class MimePart implements Serializable {
* @throws IOException an I/O related error occurred * @throws IOException an I/O related error occurred
*/ */
public InputStream getInputStream() throws IOException { public InputStream getInputStream() throws IOException {
if (fileItem != null) { if (file != null && file.canRead()) {
return new FileInputStream(file);
} else if (fileItem != null) {
return fileItem.getInputStream(); return fileItem.getInputStream();
} else if (content != null) {
return new ByteArrayInputStream(content);
} else { } else {
return new ByteArrayInputStream(getContent()); return null;
} }
} }
@ -202,7 +208,7 @@ public class MimePart implements Serializable {
*/ */
public String writeToFile(String dir, String fname) { public String writeToFile(String dir, String fname) {
try { try {
File base = new File(dir); File base = new File(dir).getAbsoluteFile();
// make directories if they don't exist // make directories if they don't exist
if (!base.exists()) { if (!base.exists()) {
@ -226,18 +232,22 @@ public class MimePart implements Serializable {
} }
} }
File file = new File(base, filename); // set instance variable to the new file
file = new File(base, filename);
if (fileItem != null) { if (fileItem != null) {
fileItem.write(file); fileItem.write(file);
// null out fileItem, since calling write() may have moved the temp file
fileItem = null;
} else { } else {
FileOutputStream fout = new FileOutputStream(file); FileOutputStream fout = new FileOutputStream(file);
fout.write(getContent()); fout.write(getContent());
fout.close(); fout.close();
} }
// return absolute file path
return filename; return file.getPath();
} catch (Exception x) { } catch (Exception x) {
System.err.println("Error in MimePart.writeToFile(): " + x);
return null; return null;
} }
} }