Fixed EOF (ctrl + D)

AlexDyakonov · Mar 20, 2023 · 666d9b7 · 666d9b7
1 parent 67591c0
commit 666d9b7
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 35 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/src/main/java/client/ui/ConsoleUI.java b/src/main/java/client/ui/ConsoleUI.java
@@ -1,5 +1,6 @@
 package client.ui;
 
+import server.exception.CommandException;
 import server.services.BuilderType;
 import server.services.CommandExecutor;
 
@@ -8,6 +9,8 @@
 import java.io.InputStreamReader;
 import java.util.Objects;
 
+import static client.ui.ConsoleColors.error;
+
 /**
  * The type Console ui.
  */
@@ -34,7 +37,7 @@ public void start() {
         String command;
 
         try (BufferedReader reader = new BufferedReader(new InputStreamReader(System.in))) {
-            while (!Objects.equals(command = reader.readLine(), "exit")) {
+            while (!Objects.equals(command = reader.readLine(), "exit") && !Objects.equals(command, null)) {
                 executor.executeCommand(command, reader, null, BuilderType.CMD);
             }
         } catch (IOException e) {

diff --git a/src/main/java/server/services/CommandExecutor.java b/src/main/java/server/services/CommandExecutor.java
@@ -4,6 +4,7 @@
 import server.controller.HumanControllerImpl;
 import server.exception.ApplicationException;
 import server.exception.ArgumentException;
+import server.exception.CommandException;
 import server.model.dto.HumanBeingRequestDTO;
 import server.services.builders.HumanBeingRequestDTOBuilder;
 
@@ -80,6 +81,7 @@ private void executeScript(String scriptName, BufferedReader reader) {
     public void executeCommand(String command, BufferedReader reader, BufferedReader reader2, BuilderType builderType) {
         long id;
         try {
+            System.out.println(command);
             String[] compositeCommand = command.split(" ");
             history.addCommandToHistory(compositeCommand[0]);
             if (compositeCommand.length > 1) {