diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 90b2ae4..e1dfd78 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,10 +5,7 @@
-
-
-
-
+
@@ -23,7 +20,7 @@
-
+
com.texttwist.client.*
@@ -43,11 +40,11 @@
-
-
+
+
-
-
+
+
@@ -55,14 +52,32 @@
-
-
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -77,11 +92,11 @@
-
+
-
-
+
+
@@ -99,16 +114,6 @@
-
-
-
-
-
-
-
-
-
-
@@ -142,9 +147,6 @@
- c
- READY
- READY
READY T
READY TO
datagramSoc
@@ -171,6 +173,9 @@
ReceiveWord
datagramP
channel
+ score
+ ComputeScore
+ 5
buffer
@@ -226,7 +231,6 @@
-
@@ -234,8 +238,9 @@
-
+
+
@@ -1202,10 +1207,11 @@
-
+
+
@@ -1218,13 +1224,13 @@
-
+
-
+
@@ -1476,14 +1482,6 @@
-
-
-
-
-
-
-
-
@@ -1492,14 +1490,6 @@
-
-
-
-
-
-
-
-
@@ -1522,13 +1512,6 @@
-
-
-
-
-
-
-
@@ -1674,18 +1657,42 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/Commons/src/constants/Config.java b/Commons/src/constants/Config.java
index eafecb0..181fb13 100644
--- a/Commons/src/constants/Config.java
+++ b/Commons/src/constants/Config.java
@@ -23,7 +23,7 @@ public class Config {
public static String NotificationServerName ="notification";
- public static int timeoutGame = 5;
+ public static int timeoutGame = 10;
public static String getNotificationServerURI(){
diff --git a/Server/src/com/texttwist/server/components/ThreadProxy.java b/Server/src/com/texttwist/server/components/ThreadProxy.java
index 3391968..adcadb5 100644
--- a/Server/src/com/texttwist/server/components/ThreadProxy.java
+++ b/Server/src/com/texttwist/server/components/ThreadProxy.java
@@ -180,7 +180,7 @@ public class ThreadProxy implements Callable {
System.out.println("TUTTI I GIOCATORI HANNO CONSEGNATO IN TEMPO");
}
- //match.setUndefinedScorePlayersToZero();
+ match.setUndefinedScorePlayersToZero();
while(true) {
Message msg = new Message("FINALSCORE", "SERVER", "", match.getMatchPlayersScoreAsStringList());
diff --git a/Server/src/com/texttwist/server/tasks/ReceiveWords.java b/Server/src/com/texttwist/server/tasks/ReceiveWords.java
index 7df2756..6e228bb 100644
--- a/Server/src/com/texttwist/server/tasks/ReceiveWords.java
+++ b/Server/src/com/texttwist/server/tasks/ReceiveWords.java
@@ -73,7 +73,7 @@ public class ReceiveWords implements Callable{
if(match.allPlayersSendedHisScore()){
System.out.println("TIMEOUT BLOCCATO, OK");
- // match.setUndefinedScorePlayersToZero();
+ match.setUndefinedScorePlayersToZero();
matchTimeout.cancel(true);
DatagramChannel.close();
diff --git a/client_1.log b/client_1.log
index 7e6e210..c1661f5 100644
--- a/client_1.log
+++ b/client_1.log
@@ -4689,3 +4689,35 @@ LOGGER (Client1): Fri Jul 07 01:11:58 CEST 2017 - Invoked invitation with userna
LOGGER (Client1): Fri Jul 07 01:11:58 CEST 2017 - a ti ha sfidato!
LOGGER (Client1): Fri Jul 07 01:11:58 CEST 2017 - Invoked invitation with username=a|[b, c, d]
LOGGER (Client1): Fri Jul 07 01:11:58 CEST 2017 - a ti ha sfidato!
+LOGGER (Client1): Fri Jul 07 01:13:32 CEST 2017 - Client starting ...
+LOGGER (Client1): Fri Jul 07 01:13:40 CEST 2017 - Client starting ...
+LOGGER (Client1): Fri Jul 07 01:13:41 CEST 2017 - Client starting ...
+LOGGER (Client1): Fri Jul 07 01:14:12 CEST 2017 - Client starting ...
+LOGGER (Client1): Fri Jul 07 01:14:14 CEST 2017 - Client starting ...
+LOGGER (Client1): Fri Jul 07 01:14:22 CEST 2017 - Invoked invitation with username=b|[a]
+LOGGER (Client1): Fri Jul 07 01:14:22 CEST 2017 - Invoked invitation with username=b|[a]
+LOGGER (Client1): Fri Jul 07 01:14:22 CEST 2017 - b ti ha sfidato!
+LOGGER (Client1): Fri Jul 07 01:14:42 CEST 2017 - Invoked invitation with username=a|[b]
+LOGGER (Client1): Fri Jul 07 01:14:42 CEST 2017 - a ti ha sfidato!
+LOGGER (Client1): Fri Jul 07 01:14:42 CEST 2017 - Invoked invitation with username=a|[b]
+LOGGER (Client1): Fri Jul 07 01:15:07 CEST 2017 - Invoked invitation with username=b|[a]
+LOGGER (Client1): Fri Jul 07 01:15:07 CEST 2017 - Invoked invitation with username=b|[a]
+LOGGER (Client1): Fri Jul 07 01:15:07 CEST 2017 - b ti ha sfidato!
+LOGGER (Client1): Fri Jul 07 01:15:35 CEST 2017 - Invoked invitation with username=b|[a]
+LOGGER (Client1): Fri Jul 07 01:15:35 CEST 2017 - Invoked invitation with username=b|[a]
+LOGGER (Client1): Fri Jul 07 01:15:35 CEST 2017 - b ti ha sfidato!
+LOGGER (Client1): Fri Jul 07 01:15:59 CEST 2017 - Invoked invitation with username=b|[a]
+LOGGER (Client1): Fri Jul 07 01:15:59 CEST 2017 - Invoked invitation with username=b|[a]
+LOGGER (Client1): Fri Jul 07 01:15:59 CEST 2017 - b ti ha sfidato!
+LOGGER (Client1): Fri Jul 07 01:16:19 CEST 2017 - Invoked invitation with username=b|[a]
+LOGGER (Client1): Fri Jul 07 01:16:19 CEST 2017 - Invoked invitation with username=b|[a]
+LOGGER (Client1): Fri Jul 07 01:16:19 CEST 2017 - b ti ha sfidato!
+LOGGER (Client1): Fri Jul 07 01:16:58 CEST 2017 - Invoked invitation with username=a|[b]
+LOGGER (Client1): Fri Jul 07 01:16:58 CEST 2017 - a ti ha sfidato!
+LOGGER (Client1): Fri Jul 07 01:16:58 CEST 2017 - Invoked invitation with username=a|[b]
+LOGGER (Client1): Fri Jul 07 01:18:04 CEST 2017 - Invoked invitation with username=b|[a]
+LOGGER (Client1): Fri Jul 07 01:18:04 CEST 2017 - Invoked invitation with username=b|[a]
+LOGGER (Client1): Fri Jul 07 01:18:04 CEST 2017 - b ti ha sfidato!
+LOGGER (Client1): Fri Jul 07 01:18:30 CEST 2017 - Invoked invitation with username=b|[a]
+LOGGER (Client1): Fri Jul 07 01:18:30 CEST 2017 - Invoked invitation with username=b|[a]
+LOGGER (Client1): Fri Jul 07 01:18:30 CEST 2017 - b ti ha sfidato!
diff --git a/server.log b/server.log
index 5556f52..bcef349 100644
--- a/server.log
+++ b/server.log
@@ -6845,3 +6845,15 @@ LOGGER (Server): Fri Jul 07 01:10:57 CEST 2017 - Invoked login with username=c A
LOGGER (Server): Fri Jul 07 01:10:57 CEST 2017 - Login successfull
LOGGER (Server): Fri Jul 07 01:10:59 CEST 2017 - Invoked login with username=d AND password=d
LOGGER (Server): Fri Jul 07 01:10:59 CEST 2017 - Login successfull
+LOGGER (Server): Fri Jul 07 01:13:38 CEST 2017 - Server starting ...
+LOGGER (Server): Fri Jul 07 01:13:38 CEST 2017 - Auth Service running at 9999 port...
+LOGGER (Server): Fri Jul 07 01:13:39 CEST 2017 - Server started
+LOGGER (Server): Fri Jul 07 01:13:39 CEST 2017 - GamePage Service is running at 10000 port...
+LOGGER (Server): Fri Jul 07 01:14:10 CEST 2017 - Server starting ...
+LOGGER (Server): Fri Jul 07 01:14:10 CEST 2017 - Auth Service running at 9999 port...
+LOGGER (Server): Fri Jul 07 01:14:10 CEST 2017 - Server started
+LOGGER (Server): Fri Jul 07 01:14:10 CEST 2017 - GamePage Service is running at 10000 port...
+LOGGER (Server): Fri Jul 07 01:14:15 CEST 2017 - Invoked login with username=a AND password=a
+LOGGER (Server): Fri Jul 07 01:14:15 CEST 2017 - Login successfull
+LOGGER (Server): Fri Jul 07 01:14:20 CEST 2017 - Invoked login with username=b AND password=b
+LOGGER (Server): Fri Jul 07 01:14:20 CEST 2017 - Login successfull