Process triggers and notifications also on exception during ActiveSca…

…ns sendAndReceive. Fixes zaproxy#7004

Signed-off-by: Dennis Kniep <kniepdennis@gmail.com>

zap/src/main/java/org/parosproxy/paros/core/scanner/AbstractPlugin.java

@@ -70,6 +70,8 @@
 // ZAP: 2020/11/17 Use new TechSet#getAllTech().
 // ZAP: 2020/11/26 Use Log4j2 getLogger() and deprecate Log4j1.x.
 // ZAP: 2021/07/20 Correct message updated with the scan rule ID header (Issue 6689).
+// ZAP: 2022/01/04 Process triggers and notifications also on exception during sendAndReceive (Issue
+// 7004).
 package org.parosproxy.paros.core.scanner;
 
 import java.io.IOException;
@@ -309,17 +311,21 @@ protected void sendAndReceive(
         // ZAP: Runs the "beforeScan" methods of any ScannerHooks
         parent.performScannerHookBeforeScan(message, this);
 
-        if (isFollowRedirect) {
-            parent.getHttpSender().sendAndReceive(message, getParent().getRedirectRequestConfig());
-        } else {
-            parent.getHttpSender().sendAndReceive(message, false);
-        }
-
-        // ZAP: Notify parent
-        parent.notifyNewMessage(this, message);
+        try {
+            if (isFollowRedirect) {
+                parent.getHttpSender()
+                        .sendAndReceive(message, getParent().getRedirectRequestConfig());
+            } else {
+                parent.getHttpSender().sendAndReceive(message, false);
+            }
+        } finally {
+            // ZAP: Notify parent
+            parent.notifyNewMessage(this, message);
 
-        // ZAP: Set the history reference back and run the "afterScan" methods of any ScannerHooks
-        parent.performScannerHookAfterScan(message, this);
+            // ZAP: Set the history reference back and run the "afterScan" methods of any
+            // ScannerHooks
+            parent.performScannerHookAfterScan(message, this);
+        }
     }
 
     @Override