Ghidra is a software reverse engineering (SRE) framework
Merge remote-tracking branch 'origin/GP-1_ghidragon_test_fixes_4_22_26'
ghidra139c3a2dad129
diff --cc Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/local/CheckoutManager.javaindex 8062d65f1a,509a1f9f2a..585d78e89e--- a/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/local/CheckoutManager.java+++ b/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/local/CheckoutManager.java@@@ -18,11 -18,12 +18,12 @@@ package ghidra.framework.store.localimport java.io.*;import java.util.*;-import org.jdom.*;-import org.jdom.input.SAXBuilder;-import org.jdom.output.XMLOutputter;+import org.jdom2.*;+import org.jdom2.input.SAXBuilder;+import org.jdom2.output.XMLOutputter;import ghidra.framework.store.*;+ import ghidra.util.Msg;import ghidra.util.xml.GenericXMLOutputter;import ghidra.util.xml.XmlUtilities;@@@ -231,9 -246,9 +246,8 @@@ class CheckoutManager/*** Read data from checkout file.*- * @throws IOException- * @throws IOException if reading checkout data fails indicating storage file path++ * @throws IOException if reading checkout data fails*/-- @SuppressWarnings("unchecked")private void readCheckoutsFile() throws IOException {checkouts = new HashMap<>();@@@ -265,8 -280,8 +279,8 @@@checkouts.put(coStatus.getCheckoutId(), coStatus);}}- catch (JDOMException je) {+ catch (org.jdom2.JDOMException je) {- throw new InvalidObjectException("Invalid checkouts file: " + checkoutsFile);+ throw new IOException("Invalid checkouts file: " + checkoutsFile, je);}finally {istream.close();