Помогите, пожалуйста, найти ошибку. Не проходит по пункту №5.
package com.javarush.task.task30.task3008;
import java.io.IOException;
import java.net.ServerSocket;
import java.net.Socket;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
public class Server {
private static Map<String, Connection> connectionMap = new ConcurrentHashMap<>();
public static void main(String[] args) {
try (ServerSocket serverSocket = new ServerSocket(ConsoleHelper.readInt())) {
System.out.println("Сервер запущен.");
while (true) {
try (Socket socket = serverSocket.accept()) {
new Handler(socket).start();
} catch (Exception e) {
break;
}
}
} catch (IOException e) {
}
}
private static class Handler extends Thread {
Socket socket;
Handler(Socket socket) {
this.socket = socket;
}
@Override
public void run() {
String userName = null;
ConsoleHelper.writeMessage("Сoeдинение установлено с " + socket.getRemoteSocketAddress());
try (Connection connection = new Connection(socket)){
userName = serverHandshake(connection);
sendBroadcastMessage(new Message(MessageType.USER_ADDED, userName));
sendListOfUsers(connection, userName);
serverMainLoop(connection, userName);
} catch (IOException | ClassNotFoundException e) {
ConsoleHelper.writeMessage("Произошла ошибка при обмене данными с удаленным адресом");
}
if (userName != null) {
connectionMap.remove(userName);
sendBroadcastMessage(new Message(MessageType.USER_REMOVED, userName));
}
ConsoleHelper.writeMessage("Соединение закрыто");
}
private String serverHandshake(Connection connection) throws IOException, ClassNotFoundException {
String userName;
while (true) {
connection.send(new Message(MessageType.NAME_REQUEST));
Message message = connection.receive();
if (message.getType().equals(MessageType.USER_NAME)) {
userName = message.getData();
if (!userName.equals("") && !connectionMap.containsKey(userName)) {
connectionMap.put(userName, connection);
connection.send(new Message(MessageType.NAME_ACCEPTED));
break;
}
}
}
return userName;
}
private void sendListOfUsers(Connection connection, String userName) throws IOException {
for (Map.Entry<String, Connection> pair : connectionMap.entrySet()) {
if (!pair.getKey().equals(userName))
connection.send(new Message(MessageType.USER_ADDED, pair.getKey()));
}
}
private void serverMainLoop(Connection connection, String userName) throws IOException, ClassNotFoundException {
while (true) {
Message message = connection.receive();
if (/*message.getType().equals(MessageType.TEXT)*/message.getType() == MessageType.TEXT) {
Message newMessage = new Message(MessageType.TEXT, userName + ": " + message.getData());
Server.sendBroadcastMessage(newMessage);
} else {
ConsoleHelper.writeMessage("Error");
}
}
}
}
public static void sendBroadcastMessage(Message message) {
for (Map.Entry<String, Connection> pair : connectionMap.entrySet()) {
try {
pair.getValue().send(message);
} catch (IOException e) {
ConsoleHelper.writeMessage("Не удалось отправить сообщение.");
//System.out.println("Не удалось отправить сообщение.");
}
}
}
}