diff --git a/cadc-inventory-server/build.gradle b/cadc-inventory-server/build.gradle index 8c071669..cfe7d425 100644 --- a/cadc-inventory-server/build.gradle +++ b/cadc-inventory-server/build.gradle @@ -12,7 +12,7 @@ repositories { sourceCompatibility = 1.8 group = 'org.opencadc' -version = '0.3.0' +version = '0.3.1' description = 'OpenCADC Storage Inventory server utility library' def git_url = 'https://github.com/opencadc/storage-inventory' diff --git a/cadc-inventory-server/src/main/java/org/opencadc/inventory/transfer/ProtocolsGenerator.java b/cadc-inventory-server/src/main/java/org/opencadc/inventory/transfer/ProtocolsGenerator.java index d8fca2f0..79ee7f3f 100644 --- a/cadc-inventory-server/src/main/java/org/opencadc/inventory/transfer/ProtocolsGenerator.java +++ b/cadc-inventory-server/src/main/java/org/opencadc/inventory/transfer/ProtocolsGenerator.java @@ -159,6 +159,11 @@ public class ProtocolsGenerator { // for use by FilesAction subclasses to enhance logging boolean storageResolverAdded = false; + + /** + * The resolved Artifact from the database or due to preventNotFound actions. + */ + public Artifact resolvedArtifact; public ProtocolsGenerator(ArtifactDAO artifactDAO, Map siteAvailabilities, Map siteRules) { this.artifactDAO = artifactDAO; @@ -241,7 +246,9 @@ public Artifact getUnsyncedArtifact(URI artifactURI, Transfer transfer, Set doPullFrom(URI artifactURI, Transfer transfer, String authToken, } } log.debug(artifactURI + " found: " + artifact); + this.resolvedArtifact = artifact; List storageSites = new ArrayList<>(); if (artifact != null) { @@ -411,7 +420,7 @@ List doPullFrom(URI artifactURI, Transfer transfer, String authToken, log.debug("added: " + p); // add a plain anon URL - if (authToken != null && !requirePreauthAnon && Standards.SECURITY_METHOD_ANON.equals(sec)) { + if (!requirePreauthAnon && Standards.SECURITY_METHOD_ANON.equals(sec)) { sb = new StringBuilder(); sb.append(baseURL.toExternalForm()).append("/"); sb.append(artifactURI.toASCIIString());