Squash bugs

Program crashes due to null exception because logic in isValid is incorrect. Fixed to avoid this issue.
zupey · Sep 14, 2022 · 5a062b8 · 5a062b8
1 parent 9f14bf0
commit 5a062b8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/main/java/duke/commands/CommandDeadlineHandler.java b/src/main/java/duke/commands/CommandDeadlineHandler.java
@@ -23,8 +23,8 @@ public CommandDeadlineHandler(String value, String flag, String additionalValue)
      * @throws DukeException error message.
      */
     public void checkValid() throws DukeException {
-        boolean isValid = value == null || !flag.equals("by") || additionalValue == null;
-        if (isValid) {
+        boolean isInvalid = value == null || flag == null || !flag.equals("by") || additionalValue == null;
+        if (isInvalid) {
             throw new InvalidSyntaxException("Correct usage: deadline return book /by 24/04/2019 1600");
         }
         assert !value.contains("|");

diff --git a/src/main/java/duke/commands/CommandEventHandler.java b/src/main/java/duke/commands/CommandEventHandler.java
@@ -25,8 +25,8 @@ public CommandEventHandler(String value, String flag, String additionalValue) th
      * @throws DukeException error message.
      */
     public void checkValid() throws DukeException {
-        boolean isValid = value == null || !flag.equals("at") || additionalValue == null;
-        if (isValid) {
+        boolean isInvalid = value == null || flag == null || !flag.equals("at") || additionalValue == null;
+        if (isInvalid) {
             throw new InvalidSyntaxException("Correct usage: event dinner /at 24/04/2019 1600");
         }
         assert !value.contains("|");