Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-06-01 05:55:13 +08:00
Code Issues Actions Packages Projects 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
Ghidra/Debug/Debugger-gadp/src/test/java/ghidra/dbg/gadp/GadpClientServerTest.java
+3 -1
View File
@@ -984,6 +984,8 @@ public class GadpClientServerTest implements AsyncTestUtils {
AsynchronousSocketChannel socket = socketChannel(); AsynchronousSocketChannel socket = socketChannel();
try (ServerRunner runner = new ServerRunner()) { try (ServerRunner runner = new ServerRunner()) {
GadpClient client = new GadpClient("Test", socket); GadpClient client = new GadpClient("Test", socket);
client.addModelListener(focusListener);
waitOn(AsyncUtils.completable(TypeSpec.VOID, socket::connect, waitOn(AsyncUtils.completable(TypeSpec.VOID, socket::connect,
runner.server.getLocalAddress())); runner.server.getLocalAddress()));
waitOn(client.connect()); waitOn(client.connect());
@@ -1044,7 +1046,7 @@ public class GadpClientServerTest implements AsyncTestUtils {
AsynchronousSocketChannel socket = socketChannel(); AsynchronousSocketChannel socket = socketChannel();
try (ServerRunner runner = new ServerRunner()) { try (ServerRunner runner = new ServerRunner()) {
GadpClient client = new GadpClient("Test", socket); GadpClient client = new GadpClient("Test", socket);
client.addModelListener(elemL);
waitOn(AsyncUtils.completable(TypeSpec.VOID, socket::connect, waitOn(AsyncUtils.completable(TypeSpec.VOID, socket::connect,
runner.server.getLocalAddress())); runner.server.getLocalAddress()));
waitOn(client.connect()); waitOn(client.connect());
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/model/DebuggerModelServicePlugin.java
+1 -1
View File
@@ -240,7 +240,7 @@ public class DebuggerModelServicePlugin extends Plugin
public boolean addModel(DebuggerObjectModel model) { public boolean addModel(DebuggerObjectModel model) {
Objects.requireNonNull(model); Objects.requireNonNull(model);
synchronized (models) { synchronized (models) {
if (models.contains(model)) { if (!models.add(model)) {
return false; return false;
} }
model.addModelListener(forRemovalAndFocusListener); model.addModelListener(forRemovalAndFocusListener);