repositories
/
TD_SR.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
TD2: Simplify the object serialization trough socket.
[TD_SR.git]
/
TD2
/
server
/
Main.java
diff --git
a/TD2/server/Main.java
b/TD2/server/Main.java
index 00d4f9eee7e4264cc8ed340a29fe641f311cfd29..ab049220967c1e0a74cb13e074363973cf64613d 100644
(file)
--- a/
TD2/server/Main.java
+++ b/
TD2/server/Main.java
@@
-5,11
+5,17
@@
public class Main {
public static void main(String[] args) {
ServerSocket listenSocket = null;
try {
public static void main(String[] args) {
ServerSocket listenSocket = null;
try {
- listenSocket = new ServerSocket(Integer.parseInt(args[0])); // port
+ int servPort = Integer.parseInt(args[0]);
+ System.out.println("Demarrage du serveur sur le port "
+ + servPort + " et en attente de connexion :");
+ listenSocket = new ServerSocket(servPort); // port
while (true) { // le dispatcher est le thread qui execute main()
Socket clientSocket = listenSocket.accept();
System.out.println("Connexion de :" + clientSocket.getInetAddress());
while (true) { // le dispatcher est le thread qui execute main()
Socket clientSocket = listenSocket.accept();
System.out.println("Connexion de :" + clientSocket.getInetAddress());
- Thread serviceThread = new Thread(new EchoServerThreadService(clientSocket));
+ //Launch the text broadcasting server
+ Thread serviceThread = new Thread(new BroadcastThreadService(clientSocket));
+ //Or launch the object broadcasting server
+ //Thread serviceThread = new Thread(new BroadcastoThreadService(clientSocket));
serviceThread.start();
}
}
serviceThread.start();
}
}
@@
-21,7
+27,8
@@
public class Main {
try {
if (listenSocket != null)
listenSocket.close();
try {
if (listenSocket != null)
listenSocket.close();
- } catch (IOException e) {
+ }
+ catch (IOException e) {
System.err.println("IOException : " + e);
e.printStackTrace();
}
System.err.println("IOException : " + e);
e.printStackTrace();
}