fix conflict

2025-10-18 23:43:06 +00:00 · 2016-04-07 16:31:10 +02:00
parent b19189634d
commit 8db0faed33
102 changed files with 665 additions and 535 deletions
--- a/dspace-api/src/main/java/org/dspace/identifier/DOIIdentifierProvider.java
+++ b/dspace-api/src/main/java/org/dspace/identifier/DOIIdentifierProvider.java
@@ -841,7 +841,7 @@ public class DOIIdentifierProvider
            // We need to generate a new DOI.
            doi = doiService.create(context);
            doiIdentifier = this.getPrefix() + "/" + this.getNamespaceSeparator() + 
-                    doi.getId();
+                    doi.getID();
        }

        // prepare new doiRow