Fix in homework 8 again

src/main/java/edu/hw8/task1/QuotesServer.java

@@ -46,7 +46,7 @@ public void start() {
     @SneakyThrows
     private void processConnections(ServerSocketChannel channel, Selector selector) {
         while (channel.isOpen()) {
-            if (selector.selectNow() > 0) {
+            if (selector.selectNow() > 0 || !selector.selectedKeys().isEmpty()) {
                 Iterator<SelectionKey> iterator = selector.selectedKeys().iterator();
                 while (iterator.hasNext()) {
                     SelectionKey key = iterator.next();

src/main/java/edu/hw8/task1/QuotesServerWorker.java

@@ -15,6 +15,7 @@ public class QuotesServerWorker implements Runnable {
 
     private final SocketChannel clientChannel;
     private final QuotesStorage quotesStorage;
+    private boolean isConnected = true;
     private final ByteBuffer byteBuffer = ByteBuffer.allocate(1024);
     private Runnable after;
     private Consumer<String> messageConsumer;
@@ -24,14 +25,15 @@ public void run() {
         Selector selector = Selector.open();
         clientChannel.configureBlocking(false);
         clientChannel.register(selector, SelectionKey.OP_READ);
-        while (clientChannel.isConnected()) {
+        while (isConnected) {
             if (selector.selectNow() > 0) {
                 Iterator<SelectionKey> iterator = selector.selectedKeys().iterator();
                 while (iterator.hasNext()) {
                     SelectionKey key = iterator.next();
                     if (key.isReadable()) {
                         String message = readMessageFromClient();
                         if (message == null) {
+                            isConnected = false;
                             break;
                         }
                         if (messageConsumer != null) {

src/test/java/edu/hw8/task1/QuotesTest.java

@@ -17,13 +17,20 @@ public void quotes_shouldCorrectlyWork() {
         List<String> userRequests = new ArrayList<>();
         List<String> serverResponses = new ArrayList<>();
         QuotesStorage quotesStorage = QuotesStorage.createDefault();
-        QuotesServer quotesServer = new QuotesServer(12345, quotesStorage, 1);
+        QuotesServer quotesServer = new QuotesServer(12345, quotesStorage, 2);
         QuotesClient quotesClient = new QuotesClient("localhost", 12345);
 
         quotesServer.setMessageConsumer(userRequests::add);
         Executors.newSingleThreadExecutor().execute(quotesServer::start);
         Thread.sleep(1000);
+
+        // Imitate multiconnnection
+        quotesClient.start();
+        quotesClient.close();
         quotesClient.start();
+        quotesClient.close();
+        quotesClient.start();
+
         serverResponses.add(quotesClient.requestQuote("личности"));
         serverResponses.add(quotesClient.requestQuote("оскорбления"));