Skip to content

[pull] main from zaproxy:main #133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 2 commits into from
Mar 3, 2026
Merged

[pull] main from zaproxy:main #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
65256f2
Reduce EDT accesses in headless
thc202 Mar 3, 2026
2e4ba5a
Merge pull request #9267 from thc202/edt-headless
kingthorin Mar 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 1 addition & 16 deletions zap/src/main/java/org/zaproxy/zap/extension/alert/ExtensionAlert.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -680,22 +680,7 @@ private void updateAlertInTreeEventHandler(Alert alert) {

@Override
public void sessionChanged(final Session session) {
if (EventQueue.isDispatchThread()) {
sessionChangedEventHandler(session);

} else {
try {
EventQueue.invokeAndWait(
new Runnable() {
@Override
public void run() {
sessionChangedEventHandler(session);
}
});
} catch (Exception e) {
LOGGER.error(e.getMessage(), e);
}
}
ThreadUtils.invokeAndWaitHandled(() -> sessionChangedEventHandler(session));
}

private void sessionChangedEventHandler(Session session) {
Expand Down
21 changes: 2 additions & 19 deletions zap/src/main/java/org/zaproxy/zap/extension/ascan/ExtensionActiveScan.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,8 @@
package org.zaproxy.zap.extension.ascan;

import java.awt.Dimension;
import java.awt.EventQueue;
import java.awt.event.KeyEvent;
import java.io.File;
import java.lang.reflect.InvocationTargetException;
import java.security.InvalidParameterException;
import java.text.MessageFormat;
import java.util.ArrayList;
Expand Down Expand Up @@ -60,6 +58,7 @@
import org.zaproxy.zap.model.Target;
import org.zaproxy.zap.users.User;
import org.zaproxy.zap.utils.Stats;
import org.zaproxy.zap.utils.ThreadUtils;
import org.zaproxy.zap.view.ZapMenuItem;

public class ExtensionActiveScan extends ExtensionAdaptor
Expand Down Expand Up @@ -423,23 +422,7 @@ private PopupMenuActiveScanCustomWithContext getPopupMenuActiveScanCustomWithCon

@Override
public void sessionChanged(final Session session) {
if (EventQueue.isDispatchThread()) {
sessionChangedEventHandler(session);

} else {
try {
EventQueue.invokeAndWait(
new Runnable() {
@Override
public void run() {
sessionChangedEventHandler(session);
}
});

} catch (InterruptedException | InvocationTargetException e) {
LOGGER.error(e.getMessage(), e);
}
}
ThreadUtils.invokeAndWaitHandled(() -> sessionChangedEventHandler(session));
}

private void sessionChangedEventHandler(Session session) {
Expand Down
27 changes: 5 additions & 22 deletions zap/src/main/java/org/zaproxy/zap/extension/brk/ExtensionBreak.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
package org.zaproxy.zap.extension.brk;

import java.awt.Component;
import java.awt.EventQueue;
import java.awt.event.KeyEvent;
import java.util.ArrayList;
import java.util.Arrays;
Expand Down Expand Up @@ -55,6 +54,7 @@
import org.zaproxy.zap.extension.brk.impl.http.ProxyListenerBreak;
import org.zaproxy.zap.extension.help.ExtensionHelp;
import org.zaproxy.zap.extension.httppanel.Message;
import org.zaproxy.zap.utils.ThreadUtils;
import org.zaproxy.zap.view.ZapMenuItem;

public class ExtensionBreak extends ExtensionAdaptor
Expand Down Expand Up @@ -548,21 +548,11 @@ public String getDescription() {

@Override
public void sessionAboutToChange(final Session session) {
if (EventQueue.isDispatchThread()) {
sessionAboutToChange();
} else {
try {
EventQueue.invokeAndWait(
new Runnable() {
@Override
public void run() {
sessionAboutToChange();
}
});
} catch (Exception e) {
LOGGER.error(e.getMessage(), e);
}
if (!hasView()) {
return;
}

ThreadUtils.invokeAndWaitHandled(() -> breakpointManagementInterface.reset());
}

@Override
Expand All @@ -573,13 +563,6 @@ public void sessionChanged(Session session) {
breakpointManagementInterface.init();
}

private void sessionAboutToChange() {
if (getView() == null) {
return;
}
breakpointManagementInterface.reset();
}

@Override
public void sessionScopeChanged(Session session) {}

Expand Down
18 changes: 1 addition & 17 deletions zap/src/main/java/org/zaproxy/zap/extension/params/ExtensionParams.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
*/
package org.zaproxy.zap.extension.params;

import java.awt.EventQueue;
import java.util.Arrays;
import java.util.Collection;
import java.util.Enumeration;
Expand Down Expand Up @@ -197,22 +196,7 @@ protected ParamsPanel getParamsPanel() {

@Override
public void sessionChanged(final Session session) {
if (EventQueue.isDispatchThread()) {
sessionChangedEventHandler(session);

} else {
try {
EventQueue.invokeAndWait(
new Runnable() {
@Override
public void run() {
sessionChangedEventHandler(session);
}
});
} catch (Exception e) {
LOGGER.error(e.getMessage(), e);
}
}
ThreadUtils.invokeAndWaitHandled(() -> sessionChangedEventHandler(session));
}

/**
Expand Down
Loading