From 8100c4a6060f3e403159b15519277d76aaf33f47 Mon Sep 17 00:00:00 2001 From: Pascal-Nicolas Becker Date: Fri, 23 Oct 2015 12:28:11 +0200 Subject: [PATCH] DS-2833: UploadWithEmbargoStep didn't parse Bitstream UUID correctly --- dspace-api/src/main/java/org/dspace/app/util/Util.java | 4 ++++ .../java/org/dspace/submit/step/UploadWithEmbargoStep.java | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dspace-api/src/main/java/org/dspace/app/util/Util.java b/dspace-api/src/main/java/org/dspace/app/util/Util.java index 25255c544b..b6baed1e37 100644 --- a/dspace-api/src/main/java/org/dspace/app/util/Util.java +++ b/dspace-api/src/main/java/org/dspace/app/util/Util.java @@ -256,6 +256,10 @@ public class Util { } catch (Exception e) { + // at least log this error to make debugging easier + // do not silently return null only. + log.warn("Unable to recoginze UUID from String \"" + + val.trim() + "\". Will return null.", e); // Problem with parameter return null; } diff --git a/dspace-api/src/main/java/org/dspace/submit/step/UploadWithEmbargoStep.java b/dspace-api/src/main/java/org/dspace/submit/step/UploadWithEmbargoStep.java index 8fe9a058f2..bed9caf842 100644 --- a/dspace-api/src/main/java/org/dspace/submit/step/UploadWithEmbargoStep.java +++ b/dspace-api/src/main/java/org/dspace/submit/step/UploadWithEmbargoStep.java @@ -513,8 +513,8 @@ public class UploadWithEmbargoStep extends UploadStep } // FORM: UploadStep SELECTED OPERATION: go to EditBitstreamPolicies else if (buttonPressed.startsWith("submit_editPolicy_")){ - String bitstreamID = buttonPressed.substring("submit_editPolicy_".length()); - Bitstream b = bitstreamService.find(context, Util.getUUIDParameter(request, bitstreamID)); + UUID bitstreamID = UUID.fromString(buttonPressed.substring("submit_editPolicy_".length())); + Bitstream b = bitstreamService.find(context, bitstreamID); subInfo.setBitstream(b); return STATUS_EDIT_POLICIES; }