Skip to content

Ghidra is a software reverse engineering (SRE) framework

Revert "GP-7294 Reuse active project data when local Ghidra URL matches location"

Ryan Kurtz02c4e67c5b54
diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/protocol/ghidra/DefaultLocalGhidraProtocolConnector.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/protocol/ghidra/DefaultLocalGhidraProtocolConnector.java
index bc5f9c3153..26c7c1461b 100644
--- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/protocol/ghidra/DefaultLocalGhidraProtocolConnector.java
+++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/protocol/ghidra/DefaultLocalGhidraProtocolConnector.java
@@ -22,8 +22,7 @@ import java.net.URL;
import ghidra.framework.client.NotConnectedException;
import ghidra.framework.client.RepositoryAdapter;
import ghidra.framework.data.DefaultProjectData;
-import ghidra.framework.main.AppInfo;
-import ghidra.framework.model.*;
+import ghidra.framework.model.ProjectLocator;
import ghidra.framework.protocol.ghidra.GhidraURLConnection.StatusCode;
import ghidra.framework.store.LockException;
import ghidra.util.NotOwnerException;
@@ -133,16 +132,6 @@ public class DefaultLocalGhidraProtocolConnector extends GhidraProtocolConnector
return null;
}
- // Use active project if it matches project locator
- Project activeProject = AppInfo.getActiveProject();
- if (activeProject != null &&
- localStorageLocator.equals(activeProject.getProjectLocator())) {
- ProjectData activeProjectData = activeProject.getProjectData();
- if (activeProjectData instanceof DefaultProjectData projectData) {
- return projectData;
- }
- }
-
try {
return new DefaultProjectData(localStorageLocator, !readOnlyAccess, false);
}