Author: rdonkin
Date: Tue Sep 15 21:10:36 2009
New Revision: 815491
URL: http://svn.apache.org/viewvc?rev=815491&view=rev
Log:
Simplified API
Modified:
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/AbstractJamesService.java
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/DelegatingJamesHandler.java
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/ProtocolHandlerHelper.java
james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPHandler.java
Modified:
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/AbstractJamesService.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/AbstractJamesService.java?rev=815491&r1=815490&r2=815491&view=diff
==============================================================================
---
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/AbstractJamesService.java
(original)
+++
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/AbstractJamesService.java
Tue Sep 15 21:10:36 2009
@@ -706,7 +706,7 @@
getLogger().debug("Handler [" + theHandler + "] obtained from
pool.");
}
- Watchdog theWatchdog =
theWatchdogFactory.getWatchdog(theHandler.getWatchdogTarget());
+ Watchdog theWatchdog = theWatchdogFactory.getWatchdog(theHandler);
theHandler.setConfigurationData(getConfigurationData());
theHandler.setStreamDumpDir(streamDumpDir);
Modified:
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/DelegatingJamesHandler.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/DelegatingJamesHandler.java?rev=815491&r1=815490&r2=815491&view=diff
==============================================================================
---
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/DelegatingJamesHandler.java
(original)
+++
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/DelegatingJamesHandler.java
Tue Sep 15 21:10:36 2009
@@ -42,7 +42,7 @@
/**
* Common Handler code
*/
-public class DelegatingJamesHandler implements ProtocolHandlerHelper,
ConnectionHandler, Poolable {
+public class DelegatingJamesHandler implements ProtocolHandlerHelper,
ConnectionHandler, Poolable, WatchdogTarget {
private static final int DEFAULT_OUTPUT_BUFFER_SIZE = 1024;
@@ -86,11 +86,6 @@
* The watchdog being used by this handler to deal with idle timeouts.
*/
private Watchdog theWatchdog;
-
- /**
- * The watchdog target that idles out this handler.
- */
- private final WatchdogTarget theWatchdogTarget = new JamesWatchdogTarget();
/**
* The remote host name obtained by lookup on the socket.
@@ -320,16 +315,6 @@
}
/**
- * Gets the Watchdog Target that should be used by Watchdogs managing
- * this connection.
- *
- * @return the WatchdogTarget
- */
- WatchdogTarget getWatchdogTarget() {
- return theWatchdogTarget;
- }
-
- /**
* Idle out this connection
*/
void idleClose() {
@@ -395,30 +380,6 @@
}
/**
- * A private inner class which serves as an adaptor
- * between the WatchdogTarget interface and this
- * handler class.
- */
- private class JamesWatchdogTarget
- implements WatchdogTarget {
-
- /**
- * @see org.apache.james.socket.WatchdogTarget#execute()
- */
- public void execute() {
- DelegatingJamesHandler.this.idleClose();
- }
-
- /**
- * Used for context sensitive logging
- */
- @Override
- public String toString() {
- return DelegatingJamesHandler.this.toString();
- }
- }
-
- /**
* If not null, this will enable dump to file for tcp connections
*
* @param streamDumpDir the dir
@@ -558,4 +519,12 @@
public Log getLogger() {
return log;
}
+
+ public boolean isDisconnected() {
+ return socket == null;
+ }
+
+ public void execute() {
+ idleClose();
+ }
}
Modified:
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/ProtocolHandlerHelper.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/ProtocolHandlerHelper.java?rev=815491&r1=815490&r2=815491&view=diff
==============================================================================
---
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/ProtocolHandlerHelper.java
(original)
+++
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/ProtocolHandlerHelper.java
Tue Sep 15 21:10:36 2009
@@ -23,7 +23,6 @@
import java.io.InputStream;
import java.io.OutputStream;
import java.io.PrintWriter;
-import java.net.Socket;
import org.apache.commons.logging.Log;
@@ -94,10 +93,11 @@
public void defaultErrorHandler(RuntimeException e);
/**
- * Provides access to the socket
- * @return socket
+ * Is the socket disconnected?
+ * @return true if the connection has disconnected,
+ * false otherwise
*/
- public Socket getSocket();
+ public boolean isDisconnected();
/**
* Gets a context sensitive logger.
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=815491&r1=815490&r2=815491&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
Tue Sep 15 21:10:36 2009
@@ -301,7 +301,7 @@
// socket will be closed and null. Do NOT
// log the exception or attempt to send the
// closing connection message
- if (helper.getSocket() != null) {
+ if (!helper.isDisconnected()) {
try {
doQUIT(null);
} catch (Throwable t) {}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
