noel 2004/04/13 14:37:53
Modified: src/java/org/apache/james/pop3server Tag: branch_2_1_fcs
POP3Handler.java
Log:
Fix JAMES-144. Was catching the wrong exception for an ArrayList. Also tweaked
some non-critical response text for clarity/consistency. Thanks to Rich O'Hammer and
Brill Pappin for helping to isolate the specifics.
Revision Changes Path
No revision
No revision
1.18.4.10 +10 -10
james-server/src/java/org/apache/james/pop3server/POP3Handler.java
Index: POP3Handler.java
===================================================================
RCS file:
/home/cvs/james-server/src/java/org/apache/james/pop3server/POP3Handler.java,v
retrieving revision 1.18.4.9
retrieving revision 1.18.4.10
diff -u -r1.18.4.9 -r1.18.4.10
--- POP3Handler.java 13 Apr 2004 21:35:51 -0000 1.18.4.9
+++ POP3Handler.java 13 Apr 2004 21:37:52 -0000 1.18.4.10
@@ -661,11 +661,11 @@
.append(ERR_RESPONSE)
.append(" Message (")
.append(num)
- .append(") does not exist.");
+ .append(") already deleted.");
responseString = responseBuffer.toString();
writeLoggedFlushedResponse(responseString);
}
- } catch (ArrayIndexOutOfBoundsException npe) {
+ } catch (IndexOutOfBoundsException npe) {
StringBuffer responseBuffer =
new StringBuffer(64)
.append(ERR_RESPONSE)
@@ -743,11 +743,11 @@
.append(ERR_RESPONSE)
.append(" Message (")
.append(num)
- .append(") does not exist.");
+ .append(") already deleted.");
responseString = responseBuffer.toString();
writeLoggedFlushedResponse(responseString);
}
- } catch (ArrayIndexOutOfBoundsException npe) {
+ } catch (IndexOutOfBoundsException npe) {
StringBuffer responseBuffer =
new StringBuffer(64)
.append(ERR_RESPONSE)
@@ -819,14 +819,14 @@
.append(ERR_RESPONSE)
.append(" Message (")
.append(num)
- .append(") does not exist.");
+ .append(") already deleted.");
responseString = responseBuffer.toString();
writeLoggedFlushedResponse(responseString);
} else {
userMailbox.set(num, DELETED);
- writeLoggedFlushedResponse(OK_RESPONSE + " Message removed");
+ writeLoggedFlushedResponse(OK_RESPONSE + " Message deleted");
}
- } catch (ArrayIndexOutOfBoundsException iob) {
+ } catch (IndexOutOfBoundsException iob) {
StringBuffer responseBuffer =
new StringBuffer(64)
.append(ERR_RESPONSE)
@@ -903,7 +903,7 @@
.append(ERR_RESPONSE)
.append(" Message (")
.append(num)
- .append(") deleted.");
+ .append(") already deleted.");
responseString = responseBuffer.toString();
writeLoggedFlushedResponse(responseString);
}
@@ -913,7 +913,7 @@
} catch (MessagingException me) {
responseString = ERR_RESPONSE + " Error while retrieving message.";
writeLoggedFlushedResponse(responseString);
- } catch (ArrayIndexOutOfBoundsException iob) {
+ } catch (IndexOutOfBoundsException iob) {
StringBuffer responseBuffer =
new StringBuffer(64)
.append(ERR_RESPONSE)
@@ -988,7 +988,7 @@
} catch (MessagingException me) {
responseString = ERR_RESPONSE + " Error while retrieving message.";
writeLoggedFlushedResponse(responseString);
- } catch (ArrayIndexOutOfBoundsException iob) {
+ } catch (IndexOutOfBoundsException iob) {
StringBuffer exceptionBuffer =
new StringBuffer(64)
.append(ERR_RESPONSE)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
