Merge branch 'main' into import_ror_updated_schema

ORCID · May 30, 2024 · 7d990ae · 7d990ae
2 parents 00bc0d3 + e19a89a
commit 7d990ae
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,15 @@
+## v2.59.0 - 2024-05-09
+
+[Full Changelog](https://github.com/ORCID/ORCID-Source/compare/v2.57.15...v2.59.0)
+
+## v2.57.15 - 2024-05-08
+
+[Full Changelog](https://github.com/ORCID/ORCID-Source/compare/v2.57.14...v2.57.15)
+
+### Fix
+
+- Return attempted resolution as false if resolver is disabled (#7029)
+
 ## 2.58.2 - 2024-04-28
 
 [Full Changelog](https://github.com/ORCID/ORCID-Source/compare/v2.57.14...2.58.2)

diff --git a/orcid-core/src/main/java/org/orcid/core/utils/v3/identifiers/resolvers/ISBNOCLCResolver.java b/orcid-core/src/main/java/org/orcid/core/utils/v3/identifiers/resolvers/ISBNOCLCResolver.java
@@ -46,7 +46,7 @@ public PIDResolutionResult resolve(String apiTypeName, String value) {
             if (disableIsbnResolution) {
                 // If it is a valid format, but the resolver is disabled,
                 // return just the valid format
-                return new PIDResolutionResult(false, true, true, null);
+                return new PIDResolutionResult(false, false, true, null);
             } else if (cache.isHttp303(normUrl)) {
                 return new PIDResolutionResult(true, true, true, normUrl);
             } else {