fix: Modify exception handlig process

Signed-off-by: Oleg Kopysov <[email protected]>
Samsung · May 28, 2024 · fbf8ff2 · fbf8ff2
1 parent dcd2fbb
commit fbf8ff2
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 1 deletion.
diff --git a/src/main/java/com/lpvs/LicensePreValidationService.java b/src/main/java/com/lpvs/LicensePreValidationService.java
@@ -60,7 +60,14 @@ public static void main(String[] args) {
             exitHandler = applicationContext.getBean(LPVSExitHandler.class);
         } catch (IllegalArgumentException e) {
             log.error("An IllegalArgumentException occurred: " + e.getMessage());
-            exitHandler.exit(-1);
+            try {
+                exitHandler.exit(-1);
+            } catch (Exception exitException) {
+                log.error(
+                        "An exception occurred during exit handling: "
+                                + exitException.getMessage());
+                System.exit(-1);
+            }
         } catch (Exception e) {
             log.info("LPVS application is being closed.");
         }

diff --git a/src/test/java/com/lpvs/LicensePreValidationServiceTest.java b/src/test/java/com/lpvs/LicensePreValidationServiceTest.java
@@ -98,6 +98,24 @@ public void testMain_IllegalAccessException_N()
         Mockito.verify(exitHandler, Mockito.times(1)).exit(anyInt());
     }
 
+    @Test
+    public void testMain_IllegalAccessException_ExitHandlerIsNull_N() {
+        ConfigurableApplicationContext applicationContext =
+                Mockito.mock(ConfigurableApplicationContext.class);
+        LPVSExitHandler exitHandler = Mockito.mock(LPVSExitHandler.class);
+        String[] args = new String[0];
+
+        mockedStatic
+                .when(() -> SpringApplication.run(LicensePreValidationService.class, args))
+                .thenReturn(applicationContext);
+
+        Mockito.doThrow(new IllegalArgumentException("Test IllegalArgumentException"))
+                .when(applicationContext)
+                .getBean(LPVSExitHandler.class);
+        LicensePreValidationService.main(args);
+        Mockito.verify(exitHandler, Mockito.times(0)).exit(anyInt());
+    }
+
     @Test
     public void testMain_Exception_N() throws NoSuchFieldException, IllegalAccessException {
         ConfigurableApplicationContext applicationContext =