From 17cfe80456cfbc0c53805d8dc2029414bad86f79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ko=C5=BEusznik?= <jan@kozusznik.cz>
Date: Thu, 5 Oct 2023 10:16:36 +0200
Subject: [PATCH] Remove multithreading - it will be implemented during
laboratory.
---
src/main/java/lab12/ServerApp.java | 4 +++-
src/main/java/lab12/ServerComunicator.java | 10 ++--------
2 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/src/main/java/lab12/ServerApp.java b/src/main/java/lab12/ServerApp.java
index 1dd3817..f051ab9 100644
--- a/src/main/java/lab12/ServerApp.java
+++ b/src/main/java/lab12/ServerApp.java
@@ -21,10 +21,12 @@ public class ServerApp {
}
protected void listen() {
+ System.out.println("Server started and ready to connection");
try {
while (true) {
Socket socketFromClient = server.accept();
- new Thread(new ServerComunicator(socketFromClient)).start();
+ System.out.println("Client connected: " + socketFromClient.getInetAddress());
+ new ServerComunicator(socketFromClient).handle();
}
} catch (Exception e) {
e.printStackTrace();
diff --git a/src/main/java/lab12/ServerComunicator.java b/src/main/java/lab12/ServerComunicator.java
index b8e3019..4eccc04 100644
--- a/src/main/java/lab12/ServerComunicator.java
+++ b/src/main/java/lab12/ServerComunicator.java
@@ -7,7 +7,7 @@ import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.net.Socket;
-public class ServerComunicator implements Runnable{
+public class ServerComunicator {
private Socket socket;
@@ -15,8 +15,7 @@ public class ServerComunicator implements Runnable{
this.socket = socketFromCliernt;
}
- @Override
- public void run() {
+ public void handle() {
try (BufferedReader readerFromClentSocket = new BufferedReader(new InputStreamReader(socket.getInputStream()));
BufferedWriter writerToClentSocket = new BufferedWriter(new OutputStreamWriter(socket.getOutputStream()))) {
String lineRededClient;
@@ -35,10 +34,5 @@ public class ServerComunicator implements Runnable{
} catch (IOException e) {
e.printStackTrace();
}
-
}
-
-
-
-
}
--
GitLab