git://git.nikiroo.be
/
fanfix.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
server: re-introduce the client/server versions
[fanfix.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 dcd1badd1ad4ade60b87313c3b0960b2b883752e..0941f7047f5363e612c299024150663bbadf5f5a 100644
(file)
--- a/
src/be/nikiroo/utils/serial/server/ServerObject.java
+++ b/
src/be/nikiroo/utils/serial/server/ServerObject.java
@@
-4,6
+4,8
@@
import java.io.IOException;
import java.net.Socket;
import java.net.UnknownHostException;
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.
/**
* This class implements a simple server that can listen for connections and
* send/receive objects.
@@
-66,7
+68,7
@@
abstract public class ServerObject extends Server {
protected ConnectActionServer createConnectActionServer(Socket s) {
return new ConnectActionServerObject(s, key) {
@Override
protected ConnectActionServer createConnectActionServer(Socket s) {
return new ConnectActionServerObject(s, key) {
@Override
- public void action() throws Exception {
+ public void action(
Version clientVersion
) throws Exception {
long id = getNextId();
try {
for (Object data = rec(); true; data = rec()) {
long id = getNextId();
try {
for (Object data = rec(); true; data = rec()) {