[pull] main from zaproxy:main

zap/src/main/java/org/parosproxy/paros/control/Control.java

@@ -411,6 +411,10 @@ public static void initSingletonForTesting(Model model) {
         control = new Control(model, null);
     }
 
+    public static void setSingletonForTesting(Control control) {
+        Control.control = control;
+    }
+
     /**
      * Initialises the {@code Control} singleton with the given data.
      *

zap/src/main/java/org/zaproxy/zap/utils/ErrorUtils.java

@@ -110,7 +110,7 @@ public boolean handleDiskSpaceException(Exception e) {
                     logAndStderr("Shutting down ZAP due to space issues...");
                     Control control = Control.getSingleton();
                     control.setExitStatus(2, errorMsg);
-                    control.exit(false, null);
+                    control.exit(true, null);
                 }
             }
 

zap/src/test/java/org/zaproxy/zap/utils/ErrorUtilsUnitTest.java

@@ -33,6 +33,7 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 import org.parosproxy.paros.Constant;
+import org.parosproxy.paros.control.Control;
 
 public class ErrorUtilsUnitTest {
 
@@ -68,6 +69,20 @@ void shouldHandleDiskSpaceException(String message) {
         assertThat(ErrorUtils.getOutOfDiskSpaceHandler().isOutOfSpace(), is(equalTo(true)));
     }
 
+    @Test
+    void shouldExitWhenExitOnOutOfSpaceEnabled() {
+        // Given
+        Control control = mock();
+        Control.setSingletonForTesting(control);
+        Exception e = new Exception("Test", new Exception("Data File size limit is reached"));
+        ErrorUtils.getOutOfDiskSpaceHandler().setExitOnOutOfSpace(true);
+        // When
+        ErrorUtils.handleDiskSpaceException(e);
+        // Then
+        verify(control).setExitStatus(2, null);
+        verify(control).exit(true, null);
+    }
+
     @Test
     void shouldIgnoreNonDiskSpaceException() {
         // Given