X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2Fserial%2Fserver%2FServerString.java;h=6fe4ad0df1a6aeb4d37aaba4de6a5f5bdf1ce306;hb=ae0ca537218b08a53929a5f2545269fc99e2b0b1;hp=a6e7a04f80dbb9d0d0e9784f5ada3d3c1b82cfcc;hpb=c1e7c70dbaaaf8efb5d977ed0e5b1128827355ed;p=fanfix.git

diff --git a/src/be/nikiroo/utils/serial/server/ServerString.java b/src/be/nikiroo/utils/serial/server/ServerString.java
index a6e7a04..6fe4ad0 100644
--- a/src/be/nikiroo/utils/serial/server/ServerString.java
+++ b/src/be/nikiroo/utils/serial/server/ServerString.java
@@ -67,10 +67,11 @@ abstract public class ServerString extends Server {
 		return new ConnectActionServerString(s, key) {
 			@Override
 			public void action() throws Exception {
+				long id = getNextId();
 				for (String data = rec(); data != null; data = rec()) {
 					String rep = null;
 					try {
-						rep = onRequest(this, data);
+						rep = onRequest(this, data, id);
 						if (isClosing()) {
 							return;
 						}
@@ -81,9 +82,10 @@ abstract public class ServerString extends Server {
 					if (rep == null) {
 						rep = "";
 					}
-
 					send(rep);
 				}
+
+				onRequestDone(id, getBytesReceived(), getBytesSent());
 			}
 
 			@Override
@@ -103,6 +105,9 @@ abstract public class ServerString extends Server {
 	 *            the client action
 	 * @param data
 	 *            the data sent by the client
+	 * @param id
+	 *            an ID to identify this request (will also be re-used for
+	 *            {@link ServerObject#onRequestDone(long, long, long)}.
 	 * 
 	 * @return the answer to return to the client
 	 * 
@@ -110,5 +115,5 @@ abstract public class ServerString extends Server {
 	 *             in case of an exception, the error will only be logged
 	 */
 	abstract protected String onRequest(ConnectActionServerString action,
-			String data) throws Exception;
+			String data, long id) throws Exception;
 }