Author: felixk
Date: Fri Sep 9 11:05:10 2011
New Revision: 1167093
URL: http://svn.apache.org/viewvc?rev=1167093&view=rev
Log:
Respect return value of File.[delete|mkdir] (JAMES-1310)
Modified:
james/server/trunk/core/src/main/java/org/apache/james/core/MimeMessageInputStreamSource.java
james/server/trunk/data-library/src/main/java/org/apache/james/repository/file/AbstractFileRepository.java
james/server/trunk/file/src/main/java/org/apache/james/mailrepository/file/MBoxMailRepository.java
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/ImapRequestFrameDecoder.java
Modified:
james/server/trunk/core/src/main/java/org/apache/james/core/MimeMessageInputStreamSource.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/core/src/main/java/org/apache/james/core/MimeMessageInputStreamSource.java?rev=1167093&r1=1167092&r2=1167093&view=diff
==============================================================================
---
james/server/trunk/core/src/main/java/org/apache/james/core/MimeMessageInputStreamSource.java
(original)
+++
james/server/trunk/core/src/main/java/org/apache/james/core/MimeMessageInputStreamSource.java
Fri Sep 9 11:05:10 2011
@@ -104,6 +104,7 @@ public class MimeMessageInputStreamSourc
// if sourceId is null while file is not null then we had
// an IOxception and we have to clean the file.
if (sourceId == null && file != null) {
+ // No need to throw an IOException when unable to delete as
it's a temporary file
file.delete();
}
}
@@ -120,6 +121,7 @@ public class MimeMessageInputStreamSourc
// if sourceId is null while file is not null then we had
// an IOxception and we have to clean the file.
if (sourceId == null && file != null) {
+ // No need to throw an IOException when unable to delete as
it's a temporary file
file.delete();
}
}
Modified:
james/server/trunk/data-library/src/main/java/org/apache/james/repository/file/AbstractFileRepository.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/data-library/src/main/java/org/apache/james/repository/file/AbstractFileRepository.java?rev=1167093&r1=1167092&r2=1167093&view=diff
==============================================================================
---
james/server/trunk/data-library/src/main/java/org/apache/james/repository/file/AbstractFileRepository.java
(original)
+++
james/server/trunk/data-library/src/main/java/org/apache/james/repository/file/AbstractFileRepository.java
Fri Sep 9 11:05:10 2011
@@ -106,7 +106,9 @@ public abstract class AbstractFileReposi
m_filter = new ExtensionFileFilter(m_extension);
// m_filter = new
NumberedRepositoryFileFilter(getExtensionDecorator());
- directory.mkdirs();
+ if (!directory.exists() && !directory.mkdirs()) {
+ throw new IOException("Unable to create directory " + directory);
+ }
getLogger().info(getClass().getName() + " opened in " +
m_baseDirectory);
Modified:
james/server/trunk/file/src/main/java/org/apache/james/mailrepository/file/MBoxMailRepository.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/file/src/main/java/org/apache/james/mailrepository/file/MBoxMailRepository.java?rev=1167093&r1=1167092&r2=1167093&view=diff
==============================================================================
---
james/server/trunk/file/src/main/java/org/apache/james/mailrepository/file/MBoxMailRepository.java
(original)
+++
james/server/trunk/file/src/main/java/org/apache/james/mailrepository/file/MBoxMailRepository.java
Fri Sep 9 11:05:10 2011
@@ -750,11 +750,13 @@ public class MBoxMailRepository implemen
outputFile.close();
// Delete the old mbox file
File mbox = new File(mboxFile);
- mbox.delete();
+ if (!mbox.delete()) {
+ throw new IOException("Unable to delete file " + mbox);
+ }
// And rename the lock file to be the new mbox
mbox = new File(mboxFile + WORKEXT);
if (!mbox.renameTo(new File(mboxFile))) {
- System.out.println("Failed to rename file!");
+ throw new IOException("Failed to rename file " + mbox + " -> "
+ mboxFile);
}
// Now delete the keys in mails from the main hash
Modified:
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/ImapRequestFrameDecoder.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/ImapRequestFrameDecoder.java?rev=1167093&r1=1167092&r2=1167093&view=diff
==============================================================================
---
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/ImapRequestFrameDecoder.java
(original)
+++
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/ImapRequestFrameDecoder.java
Fri Sep 9 11:05:10 2011
@@ -135,7 +135,9 @@ public class ImapRequestFrameDecoder ext
@Override
public void close() throws IOException {
super.close();
- f.delete();
+ if (!f.delete()) {
+ throw new IOException("Unable to delete
file " + f);
+ }
}
}, retry);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
