From db5945c286d563139246fa77cb42f2190e4f2037 Mon Sep 17 00:00:00 2001 From: ghidra1 Date: Mon, 14 Aug 2023 11:35:02 -0400 Subject: [PATCH] GP-0 corrected URL connection error message --- .../protocol/ghidra/GhidraURLWrappedContent.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/protocol/ghidra/GhidraURLWrappedContent.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/protocol/ghidra/GhidraURLWrappedContent.java index 09d41103b0..4c87433cb9 100644 --- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/protocol/ghidra/GhidraURLWrappedContent.java +++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/protocol/ghidra/GhidraURLWrappedContent.java @@ -22,6 +22,7 @@ import java.util.List; import ghidra.framework.data.DefaultProjectData; import ghidra.framework.model.*; +import ghidra.framework.store.FileSystem; import ghidra.util.InvalidNameException; /** @@ -133,9 +134,8 @@ public class GhidraURLWrappedContent { } } if (folder == null) { - // TODO: URL location not found closeProjectData(); - throw new FileNotFoundException("URL specifies unknown path: " + folderPath); + throw new FileNotFoundException("URL specifies unknown folder path: " + folderPath); } if (folderItemName == null) { @@ -156,7 +156,12 @@ public class GhidraURLWrappedContent { } closeProjectData(); - throw new FileNotFoundException("URL specifies unknown path: " + folderPath); + String path = folderPath; + if (!path.endsWith(FileSystem.SEPARATOR)) { + path += FileSystem.SEPARATOR; + } + path += folderItemName; + throw new FileNotFoundException("URL specifies unknown path: " + path); } /**