ziver/hal
1
1
Fork 0
Code Pull requests Releases Activity

added flush to sync daemons

Browse source 
Former-commit-id: ddc04e046dc645f677dc182132f985708551bfc5
This commit is contained in:
Ziver Koc 2016-01-18 17:12:32 +01:00
parent 1f7090200a
commit 3884634590
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/se/hal/deamon/PCDataSynchronizationClient.java
View file

@ -55,6 +55,7 @@ public class PCDataSynchronizationClient implements HalDaemon {
logger.warning("Protocol version do not match, skipping user. " + logger.warning("Protocol version do not match, skipping user. " +
"(local v"+PCDataSynchronizationDaemon.PROTOCOL_VERSION+" != remote v"+version+")"); "(local v"+PCDataSynchronizationDaemon.PROTOCOL_VERSION+" != remote v"+version+")");
out.writeObject(null); // Tell server we are disconnecting out.writeObject(null); // Tell server we are disconnecting
out.flush();
continue; continue;
} }

3
src/se/hal/deamon/PCDataSynchronizationDaemon.java
View file

@ -28,7 +28,7 @@ import java.util.logging.Logger;
public class PCDataSynchronizationDaemon extends ThreadedTCPNetworkServer implements HalDaemon { public class PCDataSynchronizationDaemon extends ThreadedTCPNetworkServer implements HalDaemon {
private static final Logger logger = LogUtil.getLogger(); private static final Logger logger = LogUtil.getLogger();
public static final int PROTOCOL_VERSION = 2; public static final int PROTOCOL_VERSION = 3;
public PCDataSynchronizationDaemon() { public PCDataSynchronizationDaemon() {
@ -73,6 +73,7 @@ public class PCDataSynchronizationDaemon extends ThreadedTCPNetworkServer implem
try { try {
Object obj = null; Object obj = null;
out.writeInt(PROTOCOL_VERSION); // send our protocol version to client out.writeInt(PROTOCOL_VERSION); // send our protocol version to client
out.flush();
while((obj = in.readObject()) != null){ while((obj = in.readObject()) != null){
if(obj instanceof PeerDataReqDTO){ if(obj instanceof PeerDataReqDTO){
logger.fine("Client requesting peer data"); logger.fine("Client requesting peer data");