yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-05 19:42:36 +02:00
Code Issues Releases Wiki Activity

GP-0: Fix tests after GP-2752

Browse source
This commit is contained in:
Dan 2022-11-14 12:48:33 -05:00
parent 707ec9288d
commit f6eec1731a
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Ghidra/Debug/Debugger-gadp/src/test/java/ghidra/dbg/gadp/GadpClientServerTest.java
View file

@ -984,6 +984,8 @@ public class GadpClientServerTest implements AsyncTestUtils {
AsynchronousSocketChannel socket = socketChannel();
try (ServerRunner runner = new ServerRunner()) {
GadpClient client = new GadpClient("Test", socket);
client.addModelListener(focusListener);
waitOn(AsyncUtils.completable(TypeSpec.VOID, socket::connect,
runner.server.getLocalAddress()));
waitOn(client.connect());
@ -1044,7 +1046,7 @@ public class GadpClientServerTest implements AsyncTestUtils {
AsynchronousSocketChannel socket = socketChannel();
try (ServerRunner runner = new ServerRunner()) {
GadpClient client = new GadpClient("Test", socket);
client.addModelListener(elemL);
waitOn(AsyncUtils.completable(TypeSpec.VOID, socket::connect,
runner.server.getLocalAddress()));
waitOn(client.connect());

2
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/model/DebuggerModelServicePlugin.java
View file

@ -240,7 +240,7 @@ public class DebuggerModelServicePlugin extends Plugin
public boolean addModel(DebuggerObjectModel model) {
Objects.requireNonNull(model);
synchronized (models) {
if (models.contains(model)) {
if (!models.add(model)) {
return false;
}
model.addModelListener(forRemovalAndFocusListener);