server: String -> Stream

[nikiroo-utils.git] / src / be / nikiroo / utils / serial / server / ServerObject.java

diff --git a/src/be/nikiroo/utils/serial/server/ServerObject.java b/src/be/nikiroo/utils/serial/server/ServerObject.java
index 4f72013a3e7008896a65107d6e8737f87a640c0e..0315f90c47f74b19d557e6a029e065da89dd1911 100644 (file)
--- a/src/be/nikiroo/utils/serial/server/ServerObject.java
+++ b/src/be/nikiroo/utils/serial/server/ServerObject.java
@@ -4,8 +4,6 @@ import java.io.IOException;
 import java.net.Socket;
 import java.net.UnknownHostException;
 
-import be.nikiroo.utils.Version;
-
 /**
  * This class implements a simple server that can listen for connections and
  * send/receive objects.
@@ -68,18 +66,19 @@ abstract public class ServerObject extends Server {
        protected ConnectActionServer createConnectActionServer(Socket s) {
                return new ConnectActionServerObject(s, key) {
                        @Override
-                       public void action(Version clientVersion) throws Exception {
+                       public void action() throws Exception {
                                try {
                                        for (Object data = rec(); true; data = rec()) {
                                                Object rep = null;
                                                try {
-                                                       rep = onRequest(this, clientVersion, data);
+                                                       rep = onRequest(this, data);
                                                        if (isClosing()) {
                                                                return;
                                                        }
                                                } catch (Exception e) {
                                                        onError(e);
                                                }
+
                                                send(rep);
                                        }
                                } catch (NullPointerException e) {
@@ -101,8 +100,6 @@ abstract public class ServerObject extends Server {
         * 
         * @param action
         *            the client action
-        * @param clientVersion
-        *            the client version
         * @param data
         *            the data sent by the client (which can be NULL)
         * 
@@ -112,5 +109,5 @@ abstract public class ServerObject extends Server {
         *             in case of an exception, the error will only be logged
         */
        abstract protected Object onRequest(ConnectActionServerObject action,
-                       Version clientVersion, Object data) throws Exception;
+                       Object data) throws Exception;
 }