noel 2003/10/20 01:18:29
Modified: src/java/org/apache/james/transport Tag: branch_2_1_fcs
JamesSpoolManager.java
Log:
Fix scope of variable we're now using in log message.
Revision Changes Path
No revision
No revision
1.20.4.11 +20 -19
james-server/src/java/org/apache/james/transport/JamesSpoolManager.java
Index: JamesSpoolManager.java
===================================================================
RCS file:
/home/cvs/james-server/src/java/org/apache/james/transport/JamesSpoolManager.java,v
retrieving revision 1.20.4.10
retrieving revision 1.20.4.11
diff -u -r1.20.4.10 -r1.20.4.11
--- JamesSpoolManager.java 20 Oct 2003 06:04:26 -0000 1.20.4.10
+++ JamesSpoolManager.java 20 Oct 2003 08:18:29 -0000 1.20.4.11
@@ -348,8 +348,9 @@
}
while(true) {
+ String key = null;
try {
- String key = spool.accept();
+ key = spool.accept();
MailImpl mail = spool.retrieve(key);
// Retrieve can return null if the mail is no longer on the spool
// (i.e. another thread has gotten to it first).
@@ -392,24 +393,24 @@
if (getLogger().isErrorEnabled()) {
getLogger().error("Exception processing " + key + " in
JamesSpoolManager.run "
+ e.getMessage(), e);
- }
- /* Move the mail to ERROR state? If we do, it could be
- * deleted if an error occurs in the ERROR processor.
- * Perhaps the answer is to resolve that issue by
- * having a special state for messages that are not to
- * be processed, but aren't to be deleted? The message
- * would already be in the spool, but would not be
- * touched again.
- if (mail != null) {
- try {
- mail.setState(Mail.ERROR);
- spool.store(mail);
- }
- }
- */
+ }
+ /* Move the mail to ERROR state? If we do, it could be
+ * deleted if an error occurs in the ERROR processor.
+ * Perhaps the answer is to resolve that issue by
+ * having a special state for messages that are not to
+ * be processed, but aren't to be deleted? The message
+ * would already be in the spool, but would not be
+ * touched again.
+ if (mail != null) {
+ try {
+ mail.setState(Mail.ERROR);
+ spool.store(mail);
+ }
+ }
+ */
}
- }
-
+ }
+
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
