| Chunk |
|---|
| Conflicting content |
|---|
IOUtils.copy(inputStream, fileOutputStream);
String mimeType = new MimetypesFileTypeMap().getContentType(tmpFile);
aggregateInternalResource(ResearchObject.create(createdResearchObjectURI),
<<<<<<< HEAD
createdResearchObjectURI.resolve(resourceName), new FileInputStream(tmpFile), mimeType, null);
} else {
=======
createdResearchObjectURI.resolve(resourceName), is, MimeUtil.getMimeTypes(resourceName)
.toString(), null);
} catch (AccessDeniedException | DigitalLibraryException | NotFoundException e) {
throw new BadRequestException("manifest is not correct", e);
}
} else {
try {
>>>>>>> c3bd4d09ca893cf094fa47d4ad48fc674e91e01b
aggregateExternalResource(ResearchObject.create(createdResearchObjectURI),
createdResearchObjectURI.resolve(resourceName));
} |
| Solution content |
|---|
IOUtils.copy(inputStream, fileOutputStream);
String mimeType = new MimetypesFileTypeMap().getContentType(tmpFile);
aggregateInternalResource(ResearchObject.create(createdResearchObjectURI),
createdResearchObjectURI.resolve(resourceName), new FileInputStream(tmpFile), mimeType, null);
} else {
aggregateExternalResource(ResearchObject.create(createdResearchObjectURI),
createdResearchObjectURI.resolve(resourceName));
} |
| File |
|---|
| ROSRService.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Other |