Author: rdonkin
Date: Wed Sep 16 10:33:34 2009
New Revision: 815713
URL: http://svn.apache.org/viewvc?rev=815713&view=rev
Log:
JAMES-920 Add context to method signature and replace use of helper field with
passed in context. https://issues.apache.org/jira/browse/JAMES-920
Modified:
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/JamesConnectionBridge.java
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/ProtocolHandler.java
james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapHandler.java
james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPHandler.java
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Handler.java
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManagerHandler.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPHandler.java
Modified:
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/JamesConnectionBridge.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/JamesConnectionBridge.java?rev=815713&r1=815712&r2=815713&view=diff
==============================================================================
---
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/JamesConnectionBridge.java
(original)
+++
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/JamesConnectionBridge.java
Wed Sep 16 10:33:34 2009
@@ -311,7 +311,7 @@
.append(e.getMessage());
log.info(exceptionBuffer.toString(), e);
}
- protocolHandler.fatalFailure(e);
+ protocolHandler.fatalFailure(e, this);
} finally {
//Clear all the session state variables
cleanHandler();
Modified:
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/ProtocolHandler.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/ProtocolHandler.java?rev=815713&r1=815712&r2=815713&view=diff
==============================================================================
---
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/ProtocolHandler.java
(original)
+++
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/ProtocolHandler.java
Wed Sep 16 10:33:34 2009
@@ -46,7 +46,8 @@
* Called when a fatal failure occurs during processing.
* Provides a last ditch chance to send a message to the client.
* @param e exception
+ * @param context not null
*/
- public abstract void fatalFailure(RuntimeException e);
+ public abstract void fatalFailure(RuntimeException e, ProtocolContext
context);
}
\ No newline at end of file
Modified:
james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapHandler.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapHandler.java?rev=815713&r1=815712&r2=815713&view=diff
==============================================================================
---
james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapHandler.java
(original)
+++
james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapHandler.java
Wed Sep 16 10:33:34 2009
@@ -120,9 +120,9 @@
*
* @param e the RuntimeException
*/
- public void fatalFailure(RuntimeException e) {
+ public void fatalFailure(RuntimeException e, ProtocolContext context) {
try {
- helper.getOutputStream().write(EMERGENCY_SIGNOFF);
+ context.getOutputStream().write(EMERGENCY_SIGNOFF);
} catch (Throwable t) {
getLogger().debug("Write emergency signoff failed.", t);
}
Modified:
james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPHandler.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPHandler.java?rev=815713&r1=815712&r2=815713&view=diff
==============================================================================
---
james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPHandler.java
(original)
+++
james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPHandler.java
Wed Sep 16 10:33:34 2009
@@ -286,16 +286,16 @@
}
/**
- * @see
org.apache.james.socket.AbstractJamesHandler#fatalFailure(java.lang.RuntimeException)
+ * @see
org.apache.james.socket.AbstractJamesHandler#fatalFailure(java.lang.RuntimeException,
ProtocolContext)
*/
- public void fatalFailure(RuntimeException e) {
+ public void fatalFailure(final RuntimeException e, final ProtocolContext
context) {
// If the connection has been idled out, the
// socket will be closed and null. Do NOT
// log the exception or attempt to send the
// closing connection message
- if (!helper.isDisconnected()) {
+ if (!context.isDisconnected()) {
try {
- doQUIT(null);
+ doQUIT(null, context);
} catch (Throwable t) {}
}
}
@@ -378,7 +378,7 @@
} else if ( command.equals(COMMAND_IHAVE) ) {
doIHAVE(argument);
} else if ( command.equals(COMMAND_QUIT) ) {
- doQUIT(argument);
+ doQUIT(argument, helper);
returnValue = false;
} else if ( command.equals(COMMAND_DATE) ) {
doDATE(argument);
@@ -625,9 +625,10 @@
* Quits the transaction.
*
* @param argument the argument passed in with the QUIT command
+ * @param context not null
*/
- private void doQUIT(String argument) {
- helper.writeLoggedFlushedResponse("205 closing connection");
+ private void doQUIT(String argument, ProtocolContext context) {
+ context.writeLoggedFlushedResponse("205 closing connection");
}
/**
Modified:
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Handler.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Handler.java?rev=815713&r1=815712&r2=815713&view=diff
==============================================================================
---
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Handler.java
(original)
+++
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Handler.java
Wed Sep 16 10:33:34 2009
@@ -258,12 +258,12 @@
}
/**
- * @see
org.apache.james.socket.AbstractJamesHandler#fatalFailure(java.lang.RuntimeException)
+ * @see
org.apache.james.socket.AbstractJamesHandler#fatalFailure(java.lang.RuntimeException,
ProtocolContext)
*/
- public void fatalFailure(RuntimeException e) {
+ public void fatalFailure(RuntimeException e, ProtocolContext context) {
try {
- helper.getOutputWriter().println(ERR_RESPONSE + " Error closing
connection.");
- helper.getOutputWriter().flush();
+ context.getOutputWriter().println(ERR_RESPONSE + " Error closing
connection.");
+ context.getOutputWriter().flush();
} catch (Throwable t) {
}
Modified:
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManagerHandler.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManagerHandler.java?rev=815713&r1=815712&r2=815713&view=diff
==============================================================================
---
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManagerHandler.java
(original)
+++
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManagerHandler.java
Wed Sep 16 10:33:34 2009
@@ -195,11 +195,11 @@
}
/**
- * @see
org.apache.james.socket.AbstractJamesHandler#fatalFailure(java.lang.RuntimeException)
+ * @see
org.apache.james.socket.AbstractJamesHandler#fatalFailure(java.lang.RuntimeException,
ProtocolContext)
*/
- public void fatalFailure(RuntimeException e) {
- helper.getOutputWriter().println("Unexpected Error: "+e.getMessage());
- helper.getOutputWriter().flush();
+ public void fatalFailure(RuntimeException e, ProtocolContext context) {
+ context.getOutputWriter().println("Unexpected Error: "+e.getMessage());
+ context.getOutputWriter().flush();
}
/**
Modified:
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPHandler.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPHandler.java?rev=815713&r1=815712&r2=815713&view=diff
==============================================================================
---
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPHandler.java
(original)
+++
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPHandler.java
Wed Sep 16 10:33:34 2009
@@ -371,7 +371,7 @@
}
}
- public void fatalFailure(RuntimeException e) {
+ public void fatalFailure(RuntimeException e, ProtocolContext context) {
}
public void setProtocolHandlerHelper(ProtocolContext phh) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
